Merge branch 'main' into minor-fix

googleapis · Feb 11, 2025 · 8f7a73a · 8f7a73a
2 parents c17b9c7 + 49ac09d
commit 8f7a73a
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/java-shared-dependencies/third-party-dependencies/pom.xml b/java-shared-dependencies/third-party-dependencies/pom.xml
@@ -38,7 +38,7 @@
     <j2objc-annotations.version>3.0.0</j2objc-annotations.version>
     <google.cloud.opentelemetry.version>0.33.0</google.cloud.opentelemetry.version>
     <opentelemetry-grpc-instrumentation.version>2.1.0-alpha</opentelemetry-grpc-instrumentation.version>
-    <opentelemetry-semconv.version>1.26.0-alpha</opentelemetry-semconv.version>
+    <opentelemetry-semconv.version>1.29.0-alpha</opentelemetry-semconv.version>
     <flogger.version>0.8</flogger.version>
     <arrow.version>15.0.2</arrow.version>
     <dev.cel.version>0.6.0</dev.cel.version>
@@ -144,10 +144,12 @@
         <artifactId>opentelemetry-semconv</artifactId>
         <version>${opentelemetry-semconv.version}</version>
       </dependency>
+      <!-- io.opentelemetry:opentelemetry-semconv is to be removed: https://github.com/googleapis/sdk-platform-java/issues/3598 -->
+      <!-- Does not share the same version as the dep above. Hard-code the version for now -->
       <dependency>
         <groupId>io.opentelemetry</groupId>
         <artifactId>opentelemetry-semconv</artifactId>
-        <version>${opentelemetry-semconv.version}</version>
+        <version>1.26.0-alpha</version>
       </dependency>
       <dependency>
         <groupId>com.google.cloud.opentelemetry</groupId>