feat: Cdc rebase

.github/.OwlBot.lock.yaml

@@ -13,4 +13,4 @@
 # limitations under the License.
 docker:
   image: gcr.io/cloud-devrel-public-resources/owlbot-java:latest
-  digest: sha256:e76136cc48f90aa19ba29cdfbd4002111467e44a1c9d905867d98dafafbd03bb
+  digest: sha256:9de537d592b60e5eac73b374a28263969bae91ecdb29b445e894576fbf54851c

.kokoro/requirements.in

@@ -17,7 +17,7 @@ pycparser==2.21
 pyperclip==1.8.2
 python-dateutil==2.8.2
 requests==2.27.1
-certifi==2022.9.24
+certifi==2022.12.7
 importlib-metadata==4.8.3
 zipp==3.6.0
 google_api_core==2.8.2

.kokoro/requirements.txt

@@ -16,9 +16,9 @@ cachetools==4.2.4 \
     # via
     #   -r requirements.in
     #   google-auth
-certifi==2022.9.24 \
-    --hash=sha256:0d9c601124e5a6ba9712dbc60d9c53c21e34f5f641fe83002317394311bdce14 \
-    --hash=sha256:90c1a32f1d68f940488354e36370f6cca89f0f106db09518524c88d6ed83f382
+certifi==2022.12.7 \
+    --hash=sha256:35824b4c3a97115964b408844d64aa14db1cc518f6562e8d7261699d1350a9e3 \
+    --hash=sha256:4ad3232f5e926d6718ec31cfc1fcadfde020920e278684144551c91769c7bc18
     # via
     #   -r requirements.in
     #   requests

.readme-partials.yml

@@ -116,18 +116,14 @@ custom_content: |
   TIP: If you are experiencing version conflicts with gRPC, see [Version Conflicts](#version-conflicts).
 
   ## Enabling client side metrics
-  
+
   Cloud Bigtable client supports publishing client side metrics to
   [Cloud Monitoring](https://cloud.google.com/monitoring/docs/monitoring-overview) under the
   `bigtable.googleapis.com/client` namespace.
-
-  Please fill out this [Google Form](https://forms.gle/xuhu6vCunn2MjV2m9) to sign up for the private preview of this
-  feature. And enable it by setting:
-
-  ```java
-  BigtableDataSettings.enableBuiltinMetrics();
-  ```
-
+
+  This feature is available once you upgrade to version 2.16.0 and above.
+  Follow the guide on https://cloud.google.com/bigtable/docs/client-side-metrics-setup to enable.
+
   ## Client request tracing: OpenCensus Tracing
 
   Cloud Bigtable client supports [OpenCensus Tracing](https://opencensus.io/tracing/),
@@ -203,6 +199,12 @@ custom_content: |
 
   ## Enabling Cloud Bigtable Metrics: OpenCensus Stats
 
+  ---
+  Note: We recommend [enabling client side built-in metrics](#enabling-client-side-metrics)
+  if you want to view your metrics on cloud monitoring. This integration is only for exporting the
+  metrics to a third party dashboard.
+  ---
+
   Cloud Bigtable client supports [Opencensus Metrics](https://opencensus.io/stats/),
   which gives insight into the client internals and aids in debugging production issues.
   All Cloud Bigtable Metrics are prefixed with `cloud.google.com/java/bigtable/`. The
@@ -237,7 +239,7 @@ custom_content: |
     each operation required, tagged by operation name and final operation status.
     Under normal circumstances, this will be 1.
 
-  ### GFE metric views:
+  #### GFE metric views:
   * `cloud.google.com/java/bigtable/gfe_latency`: A distribution of the latency
   between Google's network receives an RPC and reads back the first byte of
   the response.

CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## [2.17.1](https://github.com/googleapis/java-bigtable/compare/v2.17.0...v2.17.1) (2022-12-13)
+
+
+### Dependencies
+
+* Update dependency com.google.cloud:google-cloud-monitoring-bom to v3.8.0 ([#1548](https://github.com/googleapis/java-bigtable/issues/1548)) ([48f136d](https://github.com/googleapis/java-bigtable/commit/48f136dc1422d601d5470a33763e37514cf620de))
+
 ## [2.17.0](https://github.com/googleapis/java-bigtable/compare/v2.16.0...v2.17.0) (2022-12-07)
 
 

README.md

@@ -19,7 +19,7 @@ If you are using Maven with [BOM][libraries-bom], add this to your pom.xml file:
     <dependency>
       <groupId>com.google.cloud</groupId>
       <artifactId>libraries-bom</artifactId>
-      <version>26.1.5</version>
+      <version>26.3.0</version>
       <type>pom</type>
       <scope>import</scope>
     </dependency>
@@ -41,28 +41,28 @@ If you are using Maven without BOM, add this to your dependencies:
 <dependency>
   <groupId>com.google.cloud</groupId>
   <artifactId>google-cloud-bigtable</artifactId>
-  <version>2.17.0</version>
+  <version>2.17.1</version>
 </dependency>
 
 ```
 
 If you are using Gradle 5.x or later, add this to your dependencies:
 
 ```Groovy
-implementation platform('com.google.cloud:libraries-bom:26.1.5')
+implementation platform('com.google.cloud:libraries-bom:26.3.0')
 
 implementation 'com.google.cloud:google-cloud-bigtable'
 ```
 If you are using Gradle without BOM, add this to your dependencies:
 
 ```Groovy
-implementation 'com.google.cloud:google-cloud-bigtable:2.17.0'
+implementation 'com.google.cloud:google-cloud-bigtable:2.17.1'
 ```
 
 If you are using SBT, add this to your dependencies:
 
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-bigtable" % "2.17.0"
+libraryDependencies += "com.google.cloud" % "google-cloud-bigtable" % "2.17.1"
 ```
 
 ## Authentication
@@ -219,13 +219,9 @@ Cloud Bigtable client supports publishing client side metrics to
 [Cloud Monitoring](https://cloud.google.com/monitoring/docs/monitoring-overview) under the
 `bigtable.googleapis.com/client` namespace.
 
-Please fill out this [Google Form](https://forms.gle/xuhu6vCunn2MjV2m9) to sign up for the private preview of this
-feature. And enable it by setting:
+This feature is available once you upgrade to version 2.16.0 and above.
+Follow the guide on https://cloud.google.com/bigtable/docs/client-side-metrics-setup to enable.
 
-```java
-BigtableDataSettings.enableBuiltinMetrics();
-```
-
 ## Client request tracing: OpenCensus Tracing
 
 Cloud Bigtable client supports [OpenCensus Tracing](https://opencensus.io/tracing/),
@@ -301,6 +297,12 @@ Tracing.getTraceConfig().updateActiveTraceParams(
 
 ## Enabling Cloud Bigtable Metrics: OpenCensus Stats
 
+---
+Note: We recommend [enabling client side built-in metrics](#enabling-client-side-metrics)
+if you want to view your metrics on cloud monitoring. This integration is only for exporting the
+metrics to a third party dashboard.
+---
+
 Cloud Bigtable client supports [Opencensus Metrics](https://opencensus.io/stats/),
 which gives insight into the client internals and aids in debugging production issues.
 All Cloud Bigtable Metrics are prefixed with `cloud.google.com/java/bigtable/`. The
@@ -335,7 +337,7 @@ metrics will be tagged with:
   each operation required, tagged by operation name and final operation status.
   Under normal circumstances, this will be 1.
 
-### GFE metric views:
+#### GFE metric views:
 * `cloud.google.com/java/bigtable/gfe_latency`: A distribution of the latency
 between Google's network receives an RPC and reads back the first byte of
 the response.

google-cloud-bigtable-bom/pom.xml

@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.google.cloud</groupId>
     <artifactId>google-cloud-bigtable-bom</artifactId>
-    <version>2.17.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable:current} -->
+    <version>2.17.2-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable:current} -->
     <packaging>pom</packaging>
     <parent>
         <groupId>com.google.cloud</groupId>
@@ -63,42 +63,42 @@
         <dependency>
           <groupId>com.google.cloud</groupId>
           <artifactId>google-cloud-bigtable</artifactId>
-          <version>2.17.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable:current} -->
+          <version>2.17.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.154.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable-emulator:current} -->
+          <version>0.154.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.154.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable-emulator:current} -->
+          <version>0.154.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.17.1-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-bigtable-admin-v2:current} -->
+          <version>2.17.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.17.1-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-bigtable-v2:current} -->
+          <version>2.17.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.17.1-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-bigtable-admin-v2:current} -->
+          <version>2.17.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.17.1-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-bigtable-v2:current} -->
+          <version>2.17.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.17.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable:current} -->
+              <version>2.17.2-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable:current} -->
           </dependency>
       </dependencies>
     </dependencyManagement>

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

@@ -13,7 +13,7 @@
 
   <groupId>com.google.cloud</groupId>
   <artifactId>google-cloud-bigtable-deps-bom</artifactId>
-  <version>2.17.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable:current} -->
+  <version>2.17.2-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable:current} -->
 
   <packaging>pom</packaging>
   <description>
@@ -73,7 +73,7 @@
       <dependency>
         <groupId>com.google.cloud</groupId>
         <artifactId>google-cloud-monitoring-bom</artifactId>
-        <version>3.7.0</version>
+        <version>3.8.0</version>
         <exclusions>
           <exclusion>
             <!-- using the perfmark version in opencensus -->

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.17.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable:current} -->
+    <version>2.17.2-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable:current} -->
   </parent>
 
   <artifactId>google-cloud-bigtable-emulator-core</artifactId>
-  <version>0.154.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable-emulator:current} -->
+  <version>0.154.2-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable-emulator:current} -->
 
   <description>
     A Java wrapper for the Cloud Bigtable emulator.

google-cloud-bigtable-emulator/pom.xml

@@ -5,7 +5,7 @@
   <modelVersion>4.0.0</modelVersion>
 
   <artifactId>google-cloud-bigtable-emulator</artifactId>
-  <version>0.154.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable-emulator:current} -->
+  <version>0.154.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.17.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable:current} -->
+    <version>2.17.2-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable:current} -->
   </parent>
   <scm>
     <connection>scm:git:git@github.com:googleapis/java-bigtable.git</connection>
@@ -81,14 +81,14 @@
       <dependency>
         <groupId>com.google.cloud</groupId>
         <artifactId>google-cloud-bigtable-deps-bom</artifactId>
-        <version>2.17.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable:current} -->
+        <version>2.17.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.17.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable:current} -->
+        <version>2.17.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.154.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable-emulator:current} -->
+      <version>0.154.2-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable-emulator:current} -->
     </dependency>
 
     <dependency>

google-cloud-bigtable-stats/pom.xml

@@ -5,15 +5,15 @@
     <parent>
         <groupId>com.google.cloud</groupId>
         <artifactId>google-cloud-bigtable-parent</artifactId>
-        <version>2.17.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable:current} -->
+        <version>2.17.2-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable:current} -->
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <!-- This module is a workaround to support and publish built-in metrics to cloud monitoring
         through Stackdriver. Built-in metrics will be implemented with shaded OpenCensus so it won't interfere with
         customer's application metrics. -->
     <artifactId>google-cloud-bigtable-stats</artifactId>
-    <version>2.17.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable:current} -->
+    <version>2.17.2-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable:current} -->
     <description>Experimental project to shade OpenCensus dependencies.</description>
 
     <properties>
@@ -25,7 +25,7 @@
             <dependency>
                 <groupId>com.google.cloud</groupId>
                 <artifactId>google-cloud-bigtable-deps-bom</artifactId>
-                <version>2.17.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable:current} -->
+                <version>2.17.2-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable:current} -->
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>

google-cloud-bigtable/pom.xml

@@ -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.17.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable:current} -->
+  <version>2.17.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.17.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable:current} -->
+    <version>2.17.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.17.1-SNAPSHOT</java-bigtable.version><!-- {x-version-update:google-cloud-bigtable:current} -->
+    <java-bigtable.version>2.17.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.17.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable:current} -->
+        <version>2.17.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.17.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable:current} -->
+        <version>2.17.2-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable:current} -->
         <type>pom</type>
         <scope>import</scope>
       </dependency>

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.17.1-SNAPSHOT";
+  public static String VERSION = "2.17.2-SNAPSHOT";
   // {x-version-update-end}
 }