Skip to content

Commit cfa8c15

Browse files
olavloiteolavloite
authored
Merge branch 'main' into quickperf
2 parents e22857c + f8dbc91 commit cfa8c15

File tree

16 files changed

+126
-50
lines changed

16 files changed

+126
-50
lines changed

‎.github/workflows/unmanaged_dependency_check.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,6 @@ jobs:
1414
shell: bash
1515
run: .kokoro/build.sh
1616
- name: Unmanaged dependency check
17-
uses: googleapis/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check@google-cloud-shared-dependencies/v3.35.0
17+
uses: googleapis/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check@google-cloud-shared-dependencies/v3.36.1
1818
with:
1919
bom-path: pom.xml

‎.kokoro/presubmit/graalvm-native-17.cfg

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# Configure the docker image for kokoro-trampoline.
44
env_vars: {
55
key: "TRAMPOLINE_IMAGE"
6-
value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.35.0"
6+
value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.36.1"
77
}
88

99
env_vars: {

‎.kokoro/presubmit/graalvm-native.cfg

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# Configure the docker image for kokoro-trampoline.
44
env_vars: {
55
key: "TRAMPOLINE_IMAGE"
6-
value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.35.0"
6+
value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.36.1"
77
}
88

99
env_vars: {

‎CHANGELOG.md

+26
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,31 @@
11
# Changelog
22

3+
## [2.22.1](https://github.com/googleapis/java-spanner-jdbc/compare/v2.22.0...v2.22.1) (2024-10-03)
4+
5+
6+
### Bug Fixes
7+
8+
* Remove connection-id from metrics ([#1763](https://github.com/googleapis/java-spanner-jdbc/issues/1763)) ([0e54363](https://github.com/googleapis/java-spanner-jdbc/commit/0e543635d2deb1ddb133e57604adc9f88bae4dbf))
9+
10+
11+
### Dependencies
12+
13+
* Update dependency com.fasterxml.jackson.core:jackson-databind to v2.18.0 ([#1762](https://github.com/googleapis/java-spanner-jdbc/issues/1762)) ([c1fa2c3](https://github.com/googleapis/java-spanner-jdbc/commit/c1fa2c34fbc6b12ca8d602a48bb02eea4fa62b2a))
14+
* Update dependency com.google.api.grpc:proto-google-cloud-trace-v1 to v2.51.0 ([#1765](https://github.com/googleapis/java-spanner-jdbc/issues/1765)) ([30f22dd](https://github.com/googleapis/java-spanner-jdbc/commit/30f22ddb75c531098a04171048e38647a1a49aec))
15+
* Update dependency com.google.cloud:google-cloud-spanner-bom to v6.75.0 ([#1757](https://github.com/googleapis/java-spanner-jdbc/issues/1757)) ([02dac46](https://github.com/googleapis/java-spanner-jdbc/commit/02dac46299b566c30d8399585c2d22b0ac2a4d59))
16+
* Update dependency com.google.cloud:google-cloud-spanner-bom to v6.76.0 ([#1764](https://github.com/googleapis/java-spanner-jdbc/issues/1764)) ([3fc8344](https://github.com/googleapis/java-spanner-jdbc/commit/3fc83449f93f7a0a4604751fe9d6326242b107d9))
17+
* Update dependency com.google.cloud:google-cloud-spanner-bom to v6.77.0 ([#1771](https://github.com/googleapis/java-spanner-jdbc/issues/1771)) ([4050b9c](https://github.com/googleapis/java-spanner-jdbc/commit/4050b9c2dedd2a40dac628ad82a414d9e68ae1ba))
18+
* Update dependency com.google.cloud:google-cloud-trace to v2.51.0 ([#1766](https://github.com/googleapis/java-spanner-jdbc/issues/1766)) ([9b04219](https://github.com/googleapis/java-spanner-jdbc/commit/9b042197c20be094930c087f7ff674f28a8d5980))
19+
* Update dependency com.google.cloud:sdk-platform-java-config to v3.36.0 ([#1759](https://github.com/googleapis/java-spanner-jdbc/issues/1759)) ([7276ea5](https://github.com/googleapis/java-spanner-jdbc/commit/7276ea5e8358170304ad55d28cee5cd5167fb56d))
20+
* Update dependency com.google.cloud:sdk-platform-java-config to v3.36.1 ([#1761](https://github.com/googleapis/java-spanner-jdbc/issues/1761)) ([add2a22](https://github.com/googleapis/java-spanner-jdbc/commit/add2a2239705e6447b729008aca09fb71e2609f6))
21+
* Update dependency com.google.cloud.opentelemetry:exporter-trace to v0.32.0 ([#1760](https://github.com/googleapis/java-spanner-jdbc/issues/1760)) ([7768a6b](https://github.com/googleapis/java-spanner-jdbc/commit/7768a6b2c0c744ae6a36d222e798dfc8faaf634d))
22+
* Update dependency net.datafaker:datafaker to v2.4.0 ([#1767](https://github.com/googleapis/java-spanner-jdbc/issues/1767)) ([7b2d639](https://github.com/googleapis/java-spanner-jdbc/commit/7b2d639b8e0834b7bec359d8f0fe234b228323dd))
23+
* Update dependency org.springframework.boot:spring-boot to v3.3.4 ([#1754](https://github.com/googleapis/java-spanner-jdbc/issues/1754)) ([a3f10d7](https://github.com/googleapis/java-spanner-jdbc/commit/a3f10d7faa313d9ec924fe03575c7a114d2d9d35))
24+
* Update dependency org.springframework.boot:spring-boot-starter-data-jdbc to v3.3.4 ([#1755](https://github.com/googleapis/java-spanner-jdbc/issues/1755)) ([ccf5c3c](https://github.com/googleapis/java-spanner-jdbc/commit/ccf5c3c3b31358029392a11d9f58dffec62212fd))
25+
* Update dependency org.springframework.boot:spring-boot-starter-parent to v3.3.4 ([#1756](https://github.com/googleapis/java-spanner-jdbc/issues/1756)) ([6515992](https://github.com/googleapis/java-spanner-jdbc/commit/65159923685836bfd0416b16eae01a0b9bbd0b55))
26+
* Update dependency org.testcontainers:testcontainers to v1.20.2 ([#1768](https://github.com/googleapis/java-spanner-jdbc/issues/1768)) ([bb65d4f](https://github.com/googleapis/java-spanner-jdbc/commit/bb65d4f7b57918edb28013c41a35efbdb8513b56))
27+
* Update dependency org.testcontainers:testcontainers-bom to v1.20.2 ([#1769](https://github.com/googleapis/java-spanner-jdbc/issues/1769)) ([7d32ed7](https://github.com/googleapis/java-spanner-jdbc/commit/7d32ed7dadb01c53f2962b90ffa62b904c78db7c))
28+
329
## [2.22.0](https://github.com/googleapis/java-spanner-jdbc/compare/v2.21.0...v2.22.0) (2024-09-16)
430

531

‎README.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ If you are using Maven, add this to your pom.xml file:
2020
<dependency>
2121
<groupId>com.google.cloud</groupId>
2222
<artifactId>google-cloud-spanner-jdbc</artifactId>
23-
<version>2.22.0</version>
23+
<version>2.22.1</version>
2424
</dependency>
2525
```
2626
<!--- {x-version-update-end} -->
@@ -30,15 +30,15 @@ If you are using Gradle without BOM, add this to your dependencies
3030

3131
<!--- {x-version-update-start:google-cloud-spanner-jdbc:released} -->
3232
```Groovy
33-
implementation 'com.google.cloud:google-cloud-spanner-jdbc:2.22.0'
33+
implementation 'com.google.cloud:google-cloud-spanner-jdbc:2.22.1'
3434
```
3535
<!--- {x-version-update-end} -->
3636

3737
If you are using SBT, add this to your dependencies
3838

3939
<!--- {x-version-update-start:google-cloud-spanner-jdbc:released} -->
4040
```Scala
41-
libraryDependencies += "com.google.cloud" % "google-cloud-spanner-jdbc" % "2.22.0"
41+
libraryDependencies += "com.google.cloud" % "google-cloud-spanner-jdbc" % "2.22.1"
4242
```
4343
<!--- {x-version-update-end} -->
4444

‎pom.xml

+7-7
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
55
<modelVersion>4.0.0</modelVersion>
66
<artifactId>google-cloud-spanner-jdbc</artifactId>
7-
<version>2.22.0</version><!-- {x-version-update:google-cloud-spanner-jdbc:current} -->
7+
<version>2.22.2-SNAPSHOT</version><!-- {x-version-update:google-cloud-spanner-jdbc:current} -->
88
<packaging>jar</packaging>
99
<name>Google Cloud Spanner JDBC</name>
1010
<url>https://github.com/googleapis/java-spanner-jdbc</url>
@@ -14,7 +14,7 @@
1414
<parent>
1515
<groupId>com.google.cloud</groupId>
1616
<artifactId>sdk-platform-java-config</artifactId>
17-
<version>3.35.0</version>
17+
<version>3.36.1</version>
1818
</parent>
1919
<developers>
2020
<developer>
@@ -61,7 +61,7 @@
6161
<dependency>
6262
<groupId>com.google.cloud</groupId>
6363
<artifactId>google-cloud-spanner-bom</artifactId>
64-
<version>6.74.1</version>
64+
<version>6.77.0</version>
6565
<type>pom</type>
6666
<scope>import</scope>
6767
</dependency>
@@ -166,7 +166,7 @@
166166
<dependency>
167167
<groupId>org.testcontainers</groupId>
168168
<artifactId>testcontainers</artifactId>
169-
<version>1.20.1</version>
169+
<version>1.20.2</version>
170170
<scope>test</scope>
171171
</dependency>
172172
<dependency>
@@ -226,19 +226,19 @@
226226
<dependency>
227227
<groupId>com.google.cloud.opentelemetry</groupId>
228228
<artifactId>exporter-trace</artifactId>
229-
<version>0.31.0</version>
229+
<version>0.32.0</version>
230230
<scope>test</scope>
231231
</dependency>
232232
<dependency>
233233
<groupId>com.google.cloud</groupId>
234234
<artifactId>google-cloud-trace</artifactId>
235-
<version>2.49.0</version>
235+
<version>2.51.0</version>
236236
<scope>test</scope>
237237
</dependency>
238238
<dependency>
239239
<groupId>com.google.api.grpc</groupId>
240240
<artifactId>proto-google-cloud-trace-v1</artifactId>
241-
<version>2.49.0</version>
241+
<version>2.51.0</version>
242242
<scope>test</scope>
243243
</dependency>
244244

‎samples/install-without-bom/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<parent>
1515
<groupId>com.google.cloud.samples</groupId>
1616
<artifactId>shared-configuration</artifactId>
17-
<version>1.2.0</version>
17+
<version>1.2.2</version>
1818
</parent>
1919

2020
<properties>
@@ -29,7 +29,7 @@
2929
<dependency>
3030
<groupId>com.google.cloud</groupId>
3131
<artifactId>google-cloud-spanner-jdbc</artifactId>
32-
<version>2.21.0</version>
32+
<version>2.22.1</version>
3333
</dependency>
3434
<!-- [END spanner-jdbc_install_without_bom] -->
3535

‎samples/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<parent>
1919
<groupId>com.google.cloud.samples</groupId>
2020
<artifactId>shared-configuration</artifactId>
21-
<version>1.2.0</version>
21+
<version>1.2.2</version>
2222
<relativePath />
2323
</parent>
2424

‎samples/quickperf/pom.xml

+5-5
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<parent>
1313
<groupId>com.google.cloud</groupId>
1414
<artifactId>sdk-platform-java-config</artifactId>
15-
<version>3.35.0</version>
15+
<version>3.36.1</version>
1616
<relativePath/>
1717
</parent>
1818

@@ -27,7 +27,7 @@
2727
<dependency>
2828
<groupId>com.google.cloud</groupId>
2929
<artifactId>libraries-bom</artifactId>
30-
<version>26.45.0</version>
30+
<version>26.48.0</version>
3131
<type>pom</type>
3232
<scope>import</scope>
3333
</dependency>
@@ -67,19 +67,19 @@
6767
<dependency>
6868
<groupId>com.fasterxml.jackson.core</groupId>
6969
<artifactId>jackson-databind</artifactId>
70-
<version>2.17.2</version>
70+
<version>2.18.0</version>
7171
</dependency>
7272
<!-- Required for unit tests -->
7373
<dependency>
7474
<groupId>org.testcontainers</groupId>
7575
<artifactId>testcontainers</artifactId>
76-
<version>1.20.1</version>
76+
<version>1.20.2</version>
7777
<scope>test</scope>
7878
</dependency>
7979
<dependency>
8080
<groupId>org.springframework.boot</groupId>
8181
<artifactId>spring-boot</artifactId>
82-
<version>3.3.3</version>
82+
<version>3.3.4</version>
8383
<scope>test</scope>
8484
</dependency>
8585
<dependency>

‎samples/snapshot/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<parent>
1515
<groupId>com.google.cloud.samples</groupId>
1616
<artifactId>shared-configuration</artifactId>
17-
<version>1.2.0</version>
17+
<version>1.2.2</version>
1818
</parent>
1919

2020
<properties>
@@ -28,7 +28,7 @@
2828
<dependency>
2929
<groupId>com.google.cloud</groupId>
3030
<artifactId>google-cloud-spanner-jdbc</artifactId>
31-
<version>2.22.0</version>
31+
<version>2.22.2-SNAPSHOT</version>
3232
</dependency>
3333
<!-- {x-version-update-end} -->
3434

‎samples/snippets/pom.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<parent>
1010
<groupId>com.google.cloud</groupId>
1111
<artifactId>sdk-platform-java-config</artifactId>
12-
<version>3.35.0</version>
12+
<version>3.36.1</version>
1313
<relativePath/>
1414
</parent>
1515

@@ -26,7 +26,7 @@
2626
<dependency>
2727
<groupId>com.google.cloud</groupId>
2828
<artifactId>libraries-bom</artifactId>
29-
<version>26.45.0</version>
29+
<version>26.48.0</version>
3030
<type>pom</type>
3131
<scope>import</scope>
3232
</dependency>
@@ -54,7 +54,7 @@
5454
<dependency>
5555
<groupId>org.testcontainers</groupId>
5656
<artifactId>testcontainers</artifactId>
57-
<version>1.20.1</version>
57+
<version>1.20.2</version>
5858
<scope>test</scope>
5959
</dependency>
6060
<dependency>

‎samples/spring-data-jdbc/pom.xml

+5-5
Original file line numberDiff line numberDiff line change
@@ -30,14 +30,14 @@
3030
<dependency>
3131
<groupId>com.google.cloud</groupId>
3232
<artifactId>google-cloud-spanner-bom</artifactId>
33-
<version>6.74.1</version>
33+
<version>6.77.0</version>
3434
<scope>import</scope>
3535
<type>pom</type>
3636
</dependency>
3737
<dependency>
3838
<groupId>com.google.cloud</groupId>
3939
<artifactId>libraries-bom</artifactId>
40-
<version>26.45.0</version>
40+
<version>26.48.0</version>
4141
<scope>import</scope>
4242
<type>pom</type>
4343
</dependency>
@@ -55,7 +55,7 @@
5555
<dependency>
5656
<groupId>org.springframework.boot</groupId>
5757
<artifactId>spring-boot-starter-data-jdbc</artifactId>
58-
<version>3.3.3</version>
58+
<version>3.3.4</version>
5959
</dependency>
6060

6161
<!-- Add both the Cloud Spanner and the PostgreSQL JDBC driver. -->
@@ -83,7 +83,7 @@
8383
<dependency>
8484
<groupId>com.google.cloud.opentelemetry</groupId>
8585
<artifactId>exporter-trace</artifactId>
86-
<version>0.31.0</version>
86+
<version>0.32.0</version>
8787
</dependency>
8888

8989
<dependency>
@@ -114,7 +114,7 @@
114114
<dependency>
115115
<groupId>org.testcontainers</groupId>
116116
<artifactId>testcontainers</artifactId>
117-
<version>1.20.1</version>
117+
<version>1.20.2</version>
118118
<scope>test</scope>
119119
</dependency>
120120
</dependencies>

‎samples/spring-data-mybatis/pom.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<parent>
1414
<groupId>org.springframework.boot</groupId>
1515
<artifactId>spring-boot-starter-parent</artifactId>
16-
<version>3.3.3</version>
16+
<version>3.3.4</version>
1717
<relativePath/>
1818
</parent>
1919
<properties>
@@ -35,14 +35,14 @@
3535
<dependency>
3636
<groupId>com.google.cloud</groupId>
3737
<artifactId>libraries-bom</artifactId>
38-
<version>26.45.0</version>
38+
<version>26.48.0</version>
3939
<scope>import</scope>
4040
<type>pom</type>
4141
</dependency>
4242
<dependency>
4343
<groupId>org.testcontainers</groupId>
4444
<artifactId>testcontainers-bom</artifactId>
45-
<version>1.20.1</version>
45+
<version>1.20.2</version>
4646
<scope>import</scope>
4747
<type>pom</type>
4848
</dependency>

‎src/main/java/com/google/cloud/spanner/jdbc/JdbcConnection.java

+10-6
Original file line numberDiff line numberDiff line change
@@ -91,14 +91,14 @@ class JdbcConnection extends AbstractJdbcConnection {
9191

9292
private final Metrics metrics;
9393

94-
private final Attributes openTelemetryAttributes;
94+
private final Attributes openTelemetryMetricsAttributes;
9595

9696
JdbcConnection(String connectionUrl, ConnectionOptions options) throws SQLException {
9797
super(connectionUrl, options);
9898
this.useLegacyIsValidCheck = useLegacyValidCheck();
9999
OpenTelemetry openTelemetry = getSpanner().getOptions().getOpenTelemetry();
100-
this.openTelemetryAttributes =
101-
createOpenTelemetryAttributes(getConnectionOptions().getDatabaseId());
100+
this.openTelemetryMetricsAttributes =
101+
createOpenTelemetryAttributes(getConnectionOptions().getDatabaseId(), false);
102102
this.metrics = new Metrics(openTelemetry);
103103
}
104104

@@ -114,17 +114,21 @@ static boolean useLegacyValidCheck() {
114114
}
115115

116116
@VisibleForTesting
117-
static Attributes createOpenTelemetryAttributes(DatabaseId databaseId) {
117+
static Attributes createOpenTelemetryAttributes(
118+
DatabaseId databaseId, boolean includeConnectionId) {
118119
AttributesBuilder attributesBuilder = Attributes.builder();
119-
attributesBuilder.put("connection_id", UUID.randomUUID().toString());
120+
// A unique connection ID should only be included for tracing and not for metrics.
121+
if (includeConnectionId) {
122+
attributesBuilder.put("connection_id", UUID.randomUUID().toString());
123+
}
120124
attributesBuilder.put("database", databaseId.getDatabase());
121125
attributesBuilder.put("instance_id", databaseId.getInstanceId().getInstance());
122126
attributesBuilder.put("project_id", databaseId.getInstanceId().getProject());
123127
return attributesBuilder.build();
124128
}
125129

126130
public void recordClientLibLatencyMetric(long value) {
127-
metrics.recordClientLibLatency(value, openTelemetryAttributes);
131+
metrics.recordClientLibLatency(value, openTelemetryMetricsAttributes);
128132
}
129133

130134
@Override

0 commit comments

Comments
 (0)