Skip to content

Commit 1851a65

Browse files
authored
Merge branch 'main' into directpath_used_attr
2 parents 55446a0 + d60124c commit 1851a65

File tree

3 files changed

+20
-12
lines changed

3 files changed

+20
-12
lines changed

benchmarks/pom.xml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,8 @@
3434
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
3535
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
3636
<junixsocket.version>2.10.1</junixsocket.version>
37-
<opentelemetry.version>1.54.1</opentelemetry.version>
37+
<opentelemetry.version>1.56.0</opentelemetry.version>
38+
<google.cloud.monitoring.version>3.81.0</google.cloud.monitoring.version>
3839
</properties>
3940

4041
<dependencies>
@@ -59,7 +60,7 @@
5960
<dependency>
6061
<groupId>com.google.cloud</groupId>
6162
<artifactId>google-cloud-monitoring</artifactId>
62-
<version>3.77.0</version>
63+
<version>${google.cloud.monitoring.version}</version>
6364
</dependency>
6465
<!-- OpenTelemetry test dependencies -->
6566
<dependency>

google-cloud-spanner-executor/pom.xml

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
<maven.compiler.target>1.8</maven.compiler.target>
2020
<maven.compiler.source>1.8</maven.compiler.source>
2121
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
22+
<google.cloud.opentelemetry.version>0.36.0</google.cloud.opentelemetry.version>
2223
</properties>
2324

2425
<dependencies>
@@ -41,11 +42,16 @@
4142
<dependency>
4243
<groupId>io.opentelemetry</groupId>
4344
<artifactId>opentelemetry-sdk-trace</artifactId>
44-
</dependency>
45+
</dependency>
46+
<dependency>
47+
<groupId>com.google.cloud.opentelemetry</groupId>
48+
<artifactId>shared-resourcemapping</artifactId>
49+
<version>${google.cloud.opentelemetry.version}</version>
50+
</dependency>
4551
<dependency>
4652
<groupId>com.google.cloud.opentelemetry</groupId>
4753
<artifactId>exporter-trace</artifactId>
48-
<version>0.33.0</version>
54+
<version>${google.cloud.opentelemetry.version}</version>
4955
<exclusions>
5056
<exclusion>
5157
<groupId>io.opentelemetry.semconv</groupId>
@@ -64,7 +70,7 @@
6470
<dependency>
6571
<groupId>com.google.cloud</groupId>
6672
<artifactId>google-cloud-trace</artifactId>
67-
<version>2.76.0</version>
73+
<version>2.79.0</version>
6874
<!-- Version will be managed by guava -->
6975
<exclusions>
7076
<exclusion>
@@ -290,7 +296,7 @@
290296
<groupId>org.apache.maven.plugins</groupId>
291297
<artifactId>maven-dependency-plugin</artifactId>
292298
<configuration>
293-
<ignoredDependencies> com.google.api:gax,org.apache.maven.surefire:surefire-junit4,io.opentelemetry.semconv:opentelemetry-semconv </ignoredDependencies>
299+
<ignoredDependencies> com.google.api:gax,org.apache.maven.surefire:surefire-junit4,io.opentelemetry.semconv:opentelemetry-semconv,com.google.cloud.opentelemetry:shared-resourcemapping </ignoredDependencies>
294300
</configuration>
295301
</plugin>
296302
</plugins>

google-cloud-spanner/pom.xml

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
<properties>
1717
<site.installationModule>google-cloud-spanner</site.installationModule>
1818
<opencensus.version>0.31.1</opencensus.version>
19+
<google.cloud.monitoring.version>3.81.0</google.cloud.monitoring.version>
1920
<spanner.testenv.config.class>com.google.cloud.spanner.GceTestEnvConfig</spanner.testenv.config.class>
2021
<spanner.testenv.instance>projects/gcloud-devel/instances/spanner-testing-east1</spanner.testenv.instance>
2122
<spanner.gce.config.project_id>gcloud-devel</spanner.gce.config.project_id>
@@ -28,7 +29,7 @@
2829
<plugin>
2930
<groupId>org.jacoco</groupId>
3031
<artifactId>jacoco-maven-plugin</artifactId>
31-
<version>0.8.13</version>
32+
<version>0.8.14</version>
3233
<executions>
3334
<execution>
3435
<goals>
@@ -272,7 +273,7 @@
272273
<dependency>
273274
<groupId>com.google.cloud</groupId>
274275
<artifactId>google-cloud-monitoring</artifactId>
275-
<version>3.77.0</version>
276+
<version>${google.cloud.monitoring.version}</version>
276277
<!-- Version will be managed by guava -->
277278
<exclusions>
278279
<exclusion>
@@ -284,7 +285,7 @@
284285
<dependency>
285286
<groupId>com.google.api.grpc</groupId>
286287
<artifactId>proto-google-cloud-monitoring-v3</artifactId>
287-
<version>3.77.0</version>
288+
<version>${google.cloud.monitoring.version}</version>
288289
<!-- Version will be managed by guava -->
289290
<exclusions>
290291
<exclusion>
@@ -296,7 +297,7 @@
296297
<dependency>
297298
<groupId>com.google.api.grpc</groupId>
298299
<artifactId>grpc-google-cloud-monitoring-v3</artifactId>
299-
<version>3.77.0</version>
300+
<version>${google.cloud.monitoring.version}</version>
300301
<scope>test</scope>
301302
<!-- Version will be managed by guava -->
302303
<exclusions>
@@ -499,13 +500,13 @@
499500
<dependency>
500501
<groupId>com.google.cloud.opentelemetry</groupId>
501502
<artifactId>exporter-trace</artifactId>
502-
<version>0.33.0</version>
503+
<version>0.36.0</version>
503504
<scope>test</scope>
504505
</dependency>
505506
<dependency>
506507
<groupId>com.google.cloud</groupId>
507508
<artifactId>google-cloud-trace</artifactId>
508-
<version>2.76.0</version>
509+
<version>2.79.0</version>
509510
<scope>test</scope>
510511
</dependency>
511512
<dependency>

0 commit comments

Comments
 (0)