Merge branch 'main' into otel

googleapis · mutianf · Apr 12, 2024 · Jan 23, 2024 · Feb 5, 2024 · Feb 16, 2024
commit b35d95620d04bafd9505b683edefafdab3775b72
diff --git a/.github/release-please.yml b/.github/release-please.yml
@@ -51,5 +51,12 @@ branches:
  - >-
  google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/Version.java
  branch: 2.25.x
+ - bumpMinorPreMajor: true
+ handleGHRelease: true
+ releaseType: java-backport
+ extraFiles:
+ - >-
+ google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/Version.java
+ branch: 2.30.x
 extraFiles:
  - google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/Version.java
diff --git a/.github/sync-repo-settings.yaml b/.github/sync-repo-settings.yaml
@@ -19,7 +19,7 @@ branchProtectionRules:
  - 'Kokoro - Test: Java GraalVM Native Image'
  - 'Kokoro - Test: Java 17 GraalVM Native Image'
  - javadoc
- - conformance 
+ - conformance
  - pattern: 1.22.0-sp
  isAdminEnforced: true
  requiredApprovingReviewCount: 1
@@ -124,6 +124,24 @@ branchProtectionRules:
  - OwlBot Post Processor
  - 'Kokoro - Test: Java GraalVM Native Image'
  - 'Kokoro - Test: Java 17 GraalVM Native Image'
+ - pattern: 2.30.x
+ isAdminEnforced: true
+ requiredApprovingReviewCount: 1
+ requiresCodeOwnerReviews: true
+ requiresStrictStatusChecks: false
+ requiredStatusCheckContexts:
+ - dependencies (17)
+ - lint
+ - clirr
+ - units (8)
+ - units (11)
+ - 'Kokoro - Test: Integration'
+ - cla/google
+ - OwlBot Post Processor
+ - 'Kokoro - Test: Java GraalVM Native Image'
+ - 'Kokoro - Test: Java 17 GraalVM Native Image'
+ - javadoc
+ - conformance
 permissionRules:
  - team: yoshi-admins
  permission: admin

diff --git a/.kokoro/presubmit/graalvm-native-17.cfg b/.kokoro/presubmit/graalvm-native-17.cfg
@@ -3,7 +3,7 @@
 # Configure the docker image for kokoro-trampoline.
 env_vars: {
  key: "TRAMPOLINE_IMAGE"
- value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.25.0"
+ value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.27.0"
 }
 
 env_vars: {

diff --git a/.kokoro/presubmit/graalvm-native.cfg b/.kokoro/presubmit/graalvm-native.cfg
@@ -3,7 +3,7 @@
 # Configure the docker image for kokoro-trampoline.
 env_vars: {
  key: "TRAMPOLINE_IMAGE"
- value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.25.0"
+ value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.27.0"
 }
 
 env_vars: {

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,24 @@
 # Changelog
 
+## [2.35.1](https://github.com/googleapis/java-bigtable/compare/v2.35.0...v2.35.1) (2024-03-07)
+
+
+### Dependencies
+
+* Update shared dependencies ([#2140](https://github.com/googleapis/java-bigtable/issues/2140)) ([a6c9f9b](https://github.com/googleapis/java-bigtable/commit/a6c9f9bc7781535d80c4a44cb350052d6771b2e0))
+
+## [2.35.0](https://github.com/googleapis/java-bigtable/compare/v2.34.0...v2.35.0) (2024-03-05)
+
+
+### Features
+
+* Add authorized view bindings to Cloud Bigtable data APIs and messages ([#2144](https://github.com/googleapis/java-bigtable/issues/2144)) ([ae89709](https://github.com/googleapis/java-bigtable/commit/ae89709514921f7f362b7bf6057ec2f01e50046d))
+
+
+### Bug Fixes
+
+* Per-connection metrics issue when using a different Bigtable project ([#2143](https://github.com/googleapis/java-bigtable/issues/2143)) ([8dbd680](https://github.com/googleapis/java-bigtable/commit/8dbd680abc1ad13ad33981c67f8349f63432b7ea))
+
 ## [2.34.0](https://github.com/googleapis/java-bigtable/compare/v2.33.0...v2.34.0) (2024-02-21)
 
 

diff --git a/README.md b/README.md
@@ -42,7 +42,7 @@ If you are using Maven without the BOM, add this to your dependencies:
 <dependency>
  <groupId>com.google.cloud</groupId>
  <artifactId>google-cloud-bigtable</artifactId>
- <version>2.34.0</version>
+ <version>2.35.1</version>
 </dependency>
 
 ```

diff --git a/google-cloud-bigtable-bom/pom.xml b/google-cloud-bigtable-bom/pom.xml
@@ -3,12 +3,12 @@
  <modelVersion>4.0.0</modelVersion>
  <groupId>com.google.cloud</groupId>
  <artifactId>google-cloud-bigtable-bom</artifactId>
- <version>2.34.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable:current} -->
+ <version>2.35.2-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable:current} -->
  <packaging>pom</packaging>
  <parent>
  <groupId>com.google.cloud</groupId>
  <artifactId>sdk-platform-java-config</artifactId>
- <version>3.25.0</version>
+ <version>3.27.0</version>
  <relativePath/>
  </parent>
 
@@ -63,38 +63,43 @@
  <dependency>
  <groupId>com.google.cloud</groupId>
  <artifactId>google-cloud-bigtable</artifactId>
- <version>2.34.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable:current} -->
+ <version>2.35.2-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable:current} -->
  </dependency>
  <dependency>
  <groupId>com.google.cloud</groupId>
  <artifactId>google-cloud-bigtable-emulator</artifactId>
- <version>0.171.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable-emulator:current} -->
+ <version>0.172.2-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable-emulator:current} -->
  </dependency>
  <dependency>
  <groupId>com.google.cloud</groupId>
  <artifactId>google-cloud-bigtable-emulator-core</artifactId>
- <version>0.171.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable-emulator:current} -->
+ <version>0.172.2-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable-emulator:current} -->
  </dependency>
  <dependency>
  <groupId>com.google.api.grpc</groupId>
  <artifactId>grpc-google-cloud-bigtable-admin-v2</artifactId>
- <version>2.34.1-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-bigtable-admin-v2:current} -->
+ <version>2.35.2-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-bigtable-admin-v2:current} -->
  </dependency>
  <dependency>
  <groupId>com.google.api.grpc</groupId>
  <artifactId>grpc-google-cloud-bigtable-v2</artifactId>
- <version>2.34.1-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-bigtable-v2:current} -->
+ <version>2.35.2-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-bigtable-v2:current} -->
  </dependency>
  <dependency>
  <groupId>com.google.api.grpc</groupId>
  <artifactId>proto-google-cloud-bigtable-admin-v2</artifactId>
- <version>2.34.1-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-bigtable-admin-v2:current} -->
+ <version>2.35.2-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-bigtable-admin-v2:current} -->
  </dependency>
  <dependency>
  <groupId>com.google.api.grpc</groupId>
  <artifactId>proto-google-cloud-bigtable-v2</artifactId>
- <version>2.34.1-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-bigtable-v2:current} -->
+ <version>2.35.2-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-bigtable-v2:current} -->
  </dependency>
+ <dependency>
+ <groupId>com.google.cloud</groupId>
+ <artifactId>google-cloud-bigtable-stats</artifactId>
+ <version>2.35.2-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable:current} -->
+ </dependency>
  </dependencies>
  </dependencyManagement>
 

diff --git a/google-cloud-bigtable-deps-bom/pom.xml b/google-cloud-bigtable-deps-bom/pom.xml
@@ -7,13 +7,13 @@
  <parent>
  <groupId>com.google.cloud</groupId>
  <artifactId>sdk-platform-java-config</artifactId>
- <version>3.25.0</version>
+ <version>3.27.0</version>
  <relativePath/>
  </parent>
 
  <groupId>com.google.cloud</groupId>
  <artifactId>google-cloud-bigtable-deps-bom</artifactId>
- <version>2.34.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable:current} -->
+ <version>2.35.2-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable:current} -->
 
  <packaging>pom</packaging>
  <description>
@@ -66,7 +66,7 @@
  <dependency>
  <groupId>com.google.cloud</groupId>
  <artifactId>gapic-libraries-bom</artifactId>
- <version>1.30.0</version>
+ <version>1.31.0</version>
  <type>pom</type>
  <scope>import</scope>
  </dependency>

diff --git a/google-cloud-bigtable-emulator-core/pom.xml b/google-cloud-bigtable-emulator-core/pom.xml
@@ -7,11 +7,11 @@
  <parent>
  <artifactId>google-cloud-bigtable-parent</artifactId>
  <groupId>com.google.cloud</groupId>
- <version>2.34.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable:current} -->
+ <version>2.35.2-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable:current} -->
  </parent>
 
  <artifactId>google-cloud-bigtable-emulator-core</artifactId>
- <version>0.171.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable-emulator:current} -->
+ <version>0.172.2-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable-emulator:current} -->
 
  <description>
  A Java wrapper for the Cloud Bigtable emulator.

diff --git a/google-cloud-bigtable-emulator/pom.xml b/google-cloud-bigtable-emulator/pom.xml
@@ -5,7 +5,7 @@
  <modelVersion>4.0.0</modelVersion>
 
  <artifactId>google-cloud-bigtable-emulator</artifactId>
- <version>0.171.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable-emulator:current} -->
+ <version>0.172.2-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable-emulator:current} -->
  <name>Google Cloud Java - Bigtable Emulator</name>
  <url>https://github.com/googleapis/java-bigtable</url>
  <description>
@@ -14,7 +14,7 @@
  <parent>
  <groupId>com.google.cloud</groupId>
  <artifactId>google-cloud-bigtable-parent</artifactId>
- <version>2.34.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable:current} -->
+ <version>2.35.2-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable:current} -->
  </parent>
  <scm>
  <connection>scm:git:[email protected]:googleapis/java-bigtable.git</connection>
@@ -81,14 +81,14 @@
  <dependency>
  <groupId>com.google.cloud</groupId>
  <artifactId>google-cloud-bigtable-deps-bom</artifactId>
- <version>2.34.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable:current} -->
+ <version>2.35.2-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable:current} -->
  <type>pom</type>
  <scope>import</scope>
  </dependency>
  <dependency>
  <groupId>com.google.cloud</groupId>
  <artifactId>google-cloud-bigtable-bom</artifactId>
- <version>2.34.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable:current} -->
+ <version>2.35.2-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable:current} -->
  <type>pom</type>
  <scope>import</scope>
  </dependency>
@@ -99,7 +99,7 @@
  <dependency>
  <groupId>com.google.cloud</groupId>
  <artifactId>google-cloud-bigtable-emulator-core</artifactId>
- <version>0.171.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable-emulator:current} -->
+ <version>0.172.2-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable-emulator:current} -->
  </dependency>
 
  <dependency>

@@ -190,6 +190,16 @@
  <difference>
  <differenceType>7004</differenceType>
  <className>com/google/cloud/bigtable/data/v2/stub/metrics/ErrorCountPerConnectionMetricTracker</className>
+ </difference>
+ <difference>
+ <differenceType>7012</differenceType>
+ <className>com/google/cloud/bigtable/data/v2/models/MutationApi</className>
+ <method>*</method>
+ </difference>
+ <!-- InternalApi was updated -->
+ <difference>
+ <differenceType>7012</differenceType>
+ <className>com/google/cloud/bigtable/data/v2/models/ChangeStreamRecordAdapter$ChangeStreamRecordBuilder</className>
  <method>*</method>
  </difference>
 </differences>
@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
  <modelVersion>4.0.0</modelVersion>
  <artifactId>google-cloud-bigtable</artifactId>
- <version>2.34.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable:current} -->
+ <version>2.35.2-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable:current} -->
  <packaging>jar</packaging>
  <name>Google Cloud Bigtable</name>
  <url>https://github.com/googleapis/java-bigtable</url>
@@ -12,11 +12,11 @@
  <parent>
  <groupId>com.google.cloud</groupId>
  <artifactId>google-cloud-bigtable-parent</artifactId>
- <version>2.34.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable:current} -->
+ <version>2.35.2-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable:current} -->
  </parent>
  <properties>
  <!-- The version that will be embedded in the published jar via maven-resources-plugin -->
- <java-bigtable.version>2.34.1-SNAPSHOT</java-bigtable.version><!-- {x-version-update:google-cloud-bigtable:current} -->
+ <java-bigtable.version>2.35.2-SNAPSHOT</java-bigtable.version><!-- {x-version-update:google-cloud-bigtable:current} -->
 
  <site.installationModule>google-cloud-bigtable</site.installationModule>
 
@@ -47,14 +47,14 @@
  <dependency>
  <groupId>com.google.cloud</groupId>
  <artifactId>google-cloud-bigtable-deps-bom</artifactId>
- <version>2.34.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable:current} -->
+ <version>2.35.2-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable:current} -->
  <type>pom</type>
  <scope>import</scope>
  </dependency>
  <dependency>
  <groupId>com.google.cloud</groupId>
  <artifactId>google-cloud-bigtable-bom</artifactId>
- <version>2.34.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable:current} -->
+ <version>2.35.2-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable:current} -->
  <type>pom</type>
  <scope>import</scope>
  </dependency>
@@ -707,7 +707,7 @@
  <dependency>
  <groupId>org.codehaus.mojo</groupId>
  <artifactId>extra-enforcer-rules</artifactId>
- <version>1.7.0</version>
+ <version>1.8.0</version>
  </dependency>
  <dependency>
  <groupId>org.apache.maven.shared</groupId>

diff --git a/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/Version.java b/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/Version.java
@@ -20,6 +20,6 @@
 @InternalApi("For internal use only")
 public final class Version {
  // {x-version-update-start:google-cloud-bigtable:current}
- public static String VERSION = "2.34.1-SNAPSHOT";
+ public static String VERSION = "2.35.2-SNAPSHOT";
  // {x-version-update-end}
 }