From 98c0aa05ac0634a61b237f3349699ca12acbdfda Mon Sep 17 00:00:00 2001
From: Mattie Fu <mattiefu@google.com>
Date: Tue, 22 Nov 2022 15:02:04 -0500
Subject: [PATCH 1/2] deps: update dependency
 com.google.cloud:google-cloud-monitoring-bom to v3.7.0

---
 google-cloud-bigtable-deps-bom/pom.xml | 8 +++++++-
 google-cloud-bigtable-stats/pom.xml    | 4 ++++
 google-cloud-bigtable/pom.xml          | 6 ++++++
 3 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/google-cloud-bigtable-deps-bom/pom.xml b/google-cloud-bigtable-deps-bom/pom.xml
index c21963e7aede..cd390a9b5468 100644
--- a/google-cloud-bigtable-deps-bom/pom.xml
+++ b/google-cloud-bigtable-deps-bom/pom.xml
@@ -73,7 +73,13 @@
       <dependency>
         <groupId>com.google.cloud</groupId>
         <artifactId>google-cloud-monitoring-bom</artifactId>
-        <version>3.6.0</version>
+        <version>3.7.0</version>
+        <exclusions>
+          <exclusion>
+            <groupId>io.perfmark</groupId>
+            <artifactId>perfmark-api</artifactId>
+          </exclusion>
+        </exclusions>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
diff --git a/google-cloud-bigtable-stats/pom.xml b/google-cloud-bigtable-stats/pom.xml
index 97f2f696ee2b..ea4c4ba65f41 100644
--- a/google-cloud-bigtable-stats/pom.xml
+++ b/google-cloud-bigtable-stats/pom.xml
@@ -58,6 +58,10 @@
                     <groupId>com.google.http-client</groupId>
                     <artifactId>google-http-client</artifactId>
                 </exclusion>
+                <exclusion>
+                    <groupId>io.perfmark</groupId>
+                    <artifactId>perfmark-api</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
         <dependency>
diff --git a/google-cloud-bigtable/pom.xml b/google-cloud-bigtable/pom.xml
index 96f6f005acca..f3f0a7929f6a 100644
--- a/google-cloud-bigtable/pom.xml
+++ b/google-cloud-bigtable/pom.xml
@@ -268,6 +268,12 @@
     <dependency>
       <groupId>com.google.cloud</groupId>
       <artifactId>google-cloud-monitoring</artifactId>
+      <exclusions>
+        <exclusion>
+          <groupId>io.perfmark</groupId>
+          <artifactId>perfmark-api</artifactId>
+        </exclusion>
+      </exclusions>
       <scope>runtime</scope>
     </dependency>
     <dependency>

From d24581ebbb3bc94b50831be37abce149c79c1312 Mon Sep 17 00:00:00 2001
From: Mattie Fu <mattiefu@google.com>
Date: Tue, 22 Nov 2022 16:01:28 -0500
Subject: [PATCH 2/2] add a comment

---
 google-cloud-bigtable-deps-bom/pom.xml | 1 +
 google-cloud-bigtable-stats/pom.xml    | 1 +
 google-cloud-bigtable/pom.xml          | 1 +
 3 files changed, 3 insertions(+)

diff --git a/google-cloud-bigtable-deps-bom/pom.xml b/google-cloud-bigtable-deps-bom/pom.xml
index cd390a9b5468..fedb9c666b5b 100644
--- a/google-cloud-bigtable-deps-bom/pom.xml
+++ b/google-cloud-bigtable-deps-bom/pom.xml
@@ -76,6 +76,7 @@
         <version>3.7.0</version>
         <exclusions>
           <exclusion>
+            <!-- using the perfmark version in opencensus -->
             <groupId>io.perfmark</groupId>
             <artifactId>perfmark-api</artifactId>
           </exclusion>
diff --git a/google-cloud-bigtable-stats/pom.xml b/google-cloud-bigtable-stats/pom.xml
index ea4c4ba65f41..e05a351355f7 100644
--- a/google-cloud-bigtable-stats/pom.xml
+++ b/google-cloud-bigtable-stats/pom.xml
@@ -59,6 +59,7 @@
                     <artifactId>google-http-client</artifactId>
                 </exclusion>
                 <exclusion>
+                    <!-- using the perfmark version in opencensus -->
                     <groupId>io.perfmark</groupId>
                     <artifactId>perfmark-api</artifactId>
                 </exclusion>
diff --git a/google-cloud-bigtable/pom.xml b/google-cloud-bigtable/pom.xml
index f3f0a7929f6a..e92a926f98b3 100644
--- a/google-cloud-bigtable/pom.xml
+++ b/google-cloud-bigtable/pom.xml
@@ -270,6 +270,7 @@
       <artifactId>google-cloud-monitoring</artifactId>
       <exclusions>
         <exclusion>
+          <!-- using the perfmark version in opencensus -->
           <groupId>io.perfmark</groupId>
           <artifactId>perfmark-api</artifactId>
         </exclusion>