From 25c6469d271303c9ddeb3477b35146bfd2e786d8 Mon Sep 17 00:00:00 2001
From: BenWhitehead <BenWhitehead@users.noreply.github.com>
Date: Mon, 29 Jul 2024 13:56:46 -0400
Subject: [PATCH] deps: resolve dependency diamond

---
 google-cloud-storage/pom.xml | 23 -------------
 pom.xml                      | 63 +++++++++++++++++++++++++++++-------
 renovate.json                |  6 ++--
 3 files changed, 55 insertions(+), 37 deletions(-)

diff --git a/google-cloud-storage/pom.xml b/google-cloud-storage/pom.xml
index 3064436fab..fe9bb3fedf 100644
--- a/google-cloud-storage/pom.xml
+++ b/google-cloud-storage/pom.xml
@@ -128,74 +128,60 @@
     <dependency>
       <groupId>io.opentelemetry</groupId>
       <artifactId>opentelemetry-sdk</artifactId>
-      <version>1.40.0</version>
     </dependency>
     <dependency>
       <groupId>io.grpc</groupId>
       <artifactId>grpc-opentelemetry</artifactId>
-      <version>1.64.0</version>
     </dependency>
     <dependency>
       <groupId>io.opentelemetry</groupId>
       <artifactId>opentelemetry-api</artifactId>
-      <version>1.40.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.opentelemetry</groupId>
       <artifactId>opentelemetry-sdk-metrics</artifactId>
-      <version>1.40.0</version>
     </dependency>
     <dependency>
       <groupId>io.opentelemetry</groupId>
       <artifactId>opentelemetry-sdk-common</artifactId>
-      <version>1.40.0</version>
     </dependency>
     <dependency>
       <groupId>io.opentelemetry</groupId>
       <artifactId>opentelemetry-sdk-extension-autoconfigure</artifactId>
-      <version>1.40.0</version>
     </dependency>
     <dependency>
       <groupId>io.opentelemetry</groupId>
       <artifactId>opentelemetry-sdk-extension-autoconfigure-spi</artifactId>
-      <version>1.40.0</version>
     </dependency>
     <dependency>
       <groupId>io.opentelemetry</groupId>
       <artifactId>opentelemetry-sdk-logs</artifactId>
-      <version>1.40.0</version>
     </dependency>
     <dependency>
       <groupId>io.opentelemetry</groupId>
       <artifactId>opentelemetry-context</artifactId>
-      <version>1.40.0</version>
     </dependency>
     <dependency>
       <groupId>io.opentelemetry</groupId>
       <artifactId>opentelemetry-sdk-trace</artifactId>
-      <version>1.40.0</version>
     </dependency>
 
     <dependency>
       <groupId>com.google.cloud.opentelemetry</groupId>
       <artifactId>detector-resources</artifactId>
-      <version>0.27.0-alpha</version>
     </dependency>
     <dependency>
       <groupId>com.google.cloud.opentelemetry</groupId>
       <artifactId>exporter-metrics</artifactId>
-      <version>0.31.0</version>
     </dependency>
     <dependency>
       <groupId>io.opentelemetry.instrumentation</groupId>
       <artifactId>opentelemetry-resources</artifactId>
-      <version>2.5.0-alpha</version>
     </dependency>
     <dependency>
       <groupId>io.opentelemetry.contrib</groupId>
       <artifactId>opentelemetry-gcp-resources</artifactId>
-      <version>1.36.0-alpha</version>
     </dependency>
 
     <!-- Access to exception for retry handling -->
@@ -338,15 +324,6 @@
     </dependency>
 
   </dependencies>
-  <dependencyManagement>
-    <dependencies>
-      <dependency>
-        <groupId>io.opentelemetry.semconv</groupId>
-        <artifactId>opentelemetry-semconv</artifactId>
-        <version>1.25.0-alpha</version>
-      </dependency>
-    </dependencies>
-  </dependencyManagement>
 
   <build>
     <pluginManagement>
diff --git a/pom.xml b/pom.xml
index 43630521de..4778468747 100644
--- a/pom.xml
+++ b/pom.xml
@@ -54,33 +54,72 @@
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
     <github.global.server>github</github.global.server>
     <site.installationModule>google-cloud-storage-parent</site.installationModule>
-    <google.cloud.shared-dependencies.version>3.25.0</google.cloud.shared-dependencies.version>
+    <google.cloud.shared-dependencies.version>3.31.0</google.cloud.shared-dependencies.version>
   </properties>
 
   <dependencyManagement>
     <dependencies>
       <dependency>
-        <groupId>io.grpc</groupId>
-        <artifactId>grpc-bom</artifactId>
-        <version>1.64.0</version>
+        <groupId>com.google.cloud</groupId>
+        <artifactId>google-cloud-shared-dependencies</artifactId>
+        <version>${google-cloud-shared-dependencies.version}</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
+      <!--
+      Each of the following dependencies declares a dependency on opentelemtry-semconv,
+      but they differ in what version. Explicitly declare the version here to break the tie.
+      * com.google.cloud.opentelemetry:exporter-metrics
+      * com.google.cloud.opentelemetry:detector-resources
+      * io.opentelemetry.instrumentation:opentelemetry-resources
+      * io.opentelemetry.contrib:opentelemetry-gcp-resources
+      -->
+      <dependency>
+        <groupId>io.opentelemetry.semconv</groupId>
+        <artifactId>opentelemetry-semconv</artifactId>
+        <version>1.25.0-alpha</version>
+      </dependency>
       <dependency>
         <groupId>com.google.cloud.opentelemetry</groupId>
         <artifactId>exporter-metrics</artifactId>
-        <version>0.29.0</version>
+        <version>0.31.0</version>
+        <exclusions>
+          <exclusion>
+            <groupId>io.opentelemetry.semconv</groupId>
+            <artifactId>opentelemetry-semconv</artifactId>
+          </exclusion>
+        </exclusions>
       </dependency>
       <dependency>
-        <groupId>com.google.cloud</groupId>
-        <artifactId>google-cloud-shared-dependencies</artifactId>
-        <version>${google-cloud-shared-dependencies.version}</version>
-        <type>pom</type>
-        <scope>import</scope>
+        <groupId>com.google.cloud.opentelemetry</groupId>
+        <artifactId>detector-resources</artifactId>
+        <version>0.27.0-alpha</version>
+        <exclusions>
+          <exclusion>
+            <groupId>io.opentelemetry.semconv</groupId>
+            <artifactId>opentelemetry-semconv</artifactId>
+          </exclusion>
+        </exclusions>
+      </dependency>
+      <dependency>
+        <groupId>io.opentelemetry.instrumentation</groupId>
+        <artifactId>opentelemetry-resources</artifactId>
+        <version>2.6.0-alpha</version>
+        <exclusions>
+          <exclusion>
+            <groupId>io.opentelemetry.semconv</groupId>
+            <artifactId>opentelemetry-semconv</artifactId>
+          </exclusion>
+        </exclusions>
+      </dependency>
+      <dependency>
+        <groupId>io.opentelemetry.contrib</groupId>
+        <artifactId>opentelemetry-gcp-resources</artifactId>
+        <version>1.37.0-alpha</version>
         <exclusions>
           <exclusion>
-            <groupId>io.grpc</groupId>
-            <artifactId>*</artifactId>
+            <groupId>io.opentelemetry.semconv</groupId>
+            <artifactId>opentelemetry-semconv</artifactId>
           </exclusion>
         </exclusions>
       </dependency>
diff --git a/renovate.json b/renovate.json
index eafe605eaf..d053e12ae7 100644
--- a/renovate.json
+++ b/renovate.json
@@ -113,9 +113,11 @@
       "semanticCommitScope": "deps"
     },
     {
+      "groupName": "OpenTelemetry extended dependencies",
       "packagePatterns": [
-        "^io.grpc.opentelemetry:",
-        "^io.grpc:grpc-opentelemetry:",
+        "^io.opentelemetry.semconv:",
+        "^io.opentelemetry.instrumentation:",
+        "^io.opentelemetry.contrib:",
         "^com.google.cloud.opentelemetry:"
       ]
     }