Merge branch 'main' into main

rahul2393 · web-flow · commit 2006c659472c · 2025-11-17T20:07:46.000+05:30
diff --git a/benchmarks/pom.xml b/benchmarks/pom.xml
@@ -34,7 +34,8 @@
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
     <junixsocket.version>2.10.1</junixsocket.version>
-    <opentelemetry.version>1.54.1</opentelemetry.version>
+    <opentelemetry.version>1.56.0</opentelemetry.version>
+    <google.cloud.monitoring.version>3.81.0</google.cloud.monitoring.version>
   </properties>
 
   <dependencies>
@@ -59,7 +60,7 @@
     <dependency>
       <groupId>com.google.cloud</groupId>
       <artifactId>google-cloud-monitoring</artifactId>
-      <version>3.77.0</version>
+      <version>${google.cloud.monitoring.version}</version>
     </dependency>
     <!-- OpenTelemetry test dependencies -->
     <dependency>
@@ -126,7 +127,7 @@
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>exec-maven-plugin</artifactId>
-        <version>3.6.1</version>
+        <version>3.6.2</version>
         <configuration>
           <mainClass>com.google.cloud.spanner.benchmark.LatencyBenchmark</mainClass>
           <cleanupDaemonThreads>false</cleanupDaemonThreads>
diff --git a/google-cloud-spanner-executor/pom.xml b/google-cloud-spanner-executor/pom.xml
@@ -19,6 +19,7 @@
     <maven.compiler.target>1.8</maven.compiler.target>
     <maven.compiler.source>1.8</maven.compiler.source>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    <google.cloud.opentelemetry.version>0.36.0</google.cloud.opentelemetry.version>
   </properties>
 
   <dependencies>
@@ -41,11 +42,16 @@
     <dependency>
       <groupId>io.opentelemetry</groupId>
       <artifactId>opentelemetry-sdk-trace</artifactId>
-    </dependency> 
+    </dependency>
+    <dependency>
+      <groupId>com.google.cloud.opentelemetry</groupId>
+      <artifactId>shared-resourcemapping</artifactId>
+      <version>${google.cloud.opentelemetry.version}</version>
+    </dependency>
     <dependency>
       <groupId>com.google.cloud.opentelemetry</groupId>
       <artifactId>exporter-trace</artifactId>
-      <version>0.33.0</version>
+      <version>${google.cloud.opentelemetry.version}</version>
       <exclusions>
         <exclusion>
           <groupId>io.opentelemetry.semconv</groupId>
@@ -64,7 +70,7 @@
     <dependency>
       <groupId>com.google.cloud</groupId>
       <artifactId>google-cloud-trace</artifactId>
-      <version>2.76.0</version>
+      <version>2.79.0</version>
       <!-- Version will be managed by guava -->
       <exclusions>
         <exclusion>
@@ -144,7 +150,7 @@
     <dependency>
       <groupId>com.google.api.grpc</groupId>
       <artifactId>proto-google-cloud-trace-v1</artifactId>
-      <version>2.76.0</version>
+      <version>2.79.0</version>
       <!-- Version will be managed by guava -->
       <exclusions>
         <exclusion>
@@ -290,7 +296,7 @@
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-dependency-plugin</artifactId>
           <configuration>
-            <ignoredDependencies> com.google.api:gax,org.apache.maven.surefire:surefire-junit4,io.opentelemetry.semconv:opentelemetry-semconv </ignoredDependencies>
+            <ignoredDependencies> com.google.api:gax,org.apache.maven.surefire:surefire-junit4,io.opentelemetry.semconv:opentelemetry-semconv,com.google.cloud.opentelemetry:shared-resourcemapping </ignoredDependencies>
           </configuration>
         </plugin>
       </plugins>
diff --git a/google-cloud-spanner/pom.xml b/google-cloud-spanner/pom.xml
@@ -16,6 +16,7 @@
   <properties>
     <site.installationModule>google-cloud-spanner</site.installationModule>
     <opencensus.version>0.31.1</opencensus.version>
+    <google.cloud.monitoring.version>3.81.0</google.cloud.monitoring.version>
     <spanner.testenv.config.class>com.google.cloud.spanner.GceTestEnvConfig</spanner.testenv.config.class>
     <spanner.testenv.instance>projects/gcloud-devel/instances/spanner-testing-east1</spanner.testenv.instance>
     <spanner.gce.config.project_id>gcloud-devel</spanner.gce.config.project_id>
@@ -28,7 +29,7 @@
       <plugin>
         <groupId>org.jacoco</groupId>
         <artifactId>jacoco-maven-plugin</artifactId>
-        <version>0.8.13</version>
+        <version>0.8.14</version>
         <executions>
           <execution>
             <goals>
@@ -272,7 +273,7 @@
     <dependency>
       <groupId>com.google.cloud</groupId>
       <artifactId>google-cloud-monitoring</artifactId>
-      <version>3.77.0</version>
+      <version>${google.cloud.monitoring.version}</version>
       <!-- Version will be managed by guava -->
       <exclusions>
         <exclusion>
@@ -284,7 +285,7 @@
     <dependency>
       <groupId>com.google.api.grpc</groupId>
       <artifactId>proto-google-cloud-monitoring-v3</artifactId>
-      <version>3.77.0</version>
+      <version>${google.cloud.monitoring.version}</version>
       <!-- Version will be managed by guava -->
       <exclusions>
         <exclusion>
@@ -296,7 +297,7 @@
     <dependency>
       <groupId>com.google.api.grpc</groupId>
       <artifactId>grpc-google-cloud-monitoring-v3</artifactId>
-      <version>3.77.0</version>
+      <version>${google.cloud.monitoring.version}</version>
       <scope>test</scope>
       <!-- Version will be managed by guava -->
       <exclusions>
@@ -499,19 +500,19 @@
     <dependency>
       <groupId>com.google.cloud.opentelemetry</groupId>
       <artifactId>exporter-trace</artifactId>
-      <version>0.33.0</version>
+      <version>0.36.0</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>com.google.cloud</groupId>
       <artifactId>google-cloud-trace</artifactId>
-      <version>2.76.0</version>
+      <version>2.79.0</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>com.google.api.grpc</groupId>
       <artifactId>proto-google-cloud-trace-v1</artifactId>
-      <version>2.76.0</version>
+      <version>2.79.0</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/google-cloud-spanner/src/test/resources/com/google/cloud/spanner/jmh/jmh-baseline.json b/google-cloud-spanner/src/test/resources/com/google/cloud/spanner/jmh/jmh-baseline.json
@@ -5,7 +5,7 @@
         {
           "percentile": "50.0",
           "baseline": "450",
-          "difference": "15"
+          "difference": "20"
         }
       ]
     },
@@ -14,7 +14,7 @@
         {
           "percentile": "50.0",
           "baseline": "450",
-          "difference": "15"
+          "difference": "20"
         }
       ]
     }
diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml
@@ -23,7 +23,7 @@
     <maven.compiler.source>1.8</maven.compiler.source>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <opencensus.version>0.31.1</opencensus.version>
-    <trace.version>2.76.0</trace.version>
+    <trace.version>2.79.0</trace.version>
     <cloudmonitoring.version>3.77.0</cloudmonitoring.version>
   </properties>
 
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
@@ -23,7 +23,7 @@
     <maven.compiler.source>1.8</maven.compiler.source>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <opencensus.version>0.31.1</opencensus.version>
-    <trace.version>2.76.0</trace.version>
+    <trace.version>2.79.0</trace.version>
     <cloudmonitoring.version>3.77.0</cloudmonitoring.version>
   </properties>
 

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`	`{`
`6`	`6`	`"percentile": "50.0",`
`7`	`7`	`"baseline": "450",`
`8`		`- "difference": "15"`
	`8`	`+ "difference": "20"`
`9`	`9`	`}`
`10`	`10`	`]`
`11`	`11`	`},`
`@@ -14,7 +14,7 @@`
`14`	`14`	`{`
`15`	`15`	`"percentile": "50.0",`
`16`	`16`	`"baseline": "450",`
`17`		`- "difference": "15"`
	`17`	`+ "difference": "20"`
`18`	`18`	`}`
`19`	`19`	`]`
`20`	`20`	`}`