Skip to content

Commit 08011a5

Browse files
deps: update dependency com.google.cloud:sdk-platform-java-config to v3.33.0 (#1693)
* deps: update dependency com.google.cloud:sdk-platform-java-config to v3.33.0 * deps: add incubator dep needed for test * deps: work around unnecessary dependency * chore: run formatter --------- Co-authored-by: Knut Olav Løite <[email protected]>
1 parent 148c655 commit 08011a5

File tree

6 files changed

+17
-8
lines changed

6 files changed

+17
-8
lines changed

.github/workflows/unmanaged_dependency_check.yaml

Lines changed: 1 addition & 1 deletion
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.32.0
17+
uses: googleapis/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check@google-cloud-shared-dependencies/v3.33.0
1818
with:
1919
bom-path: pom.xml

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

Lines changed: 1 addition & 1 deletion
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.32.0"
6+
value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.33.0"
77
}
88

99
env_vars: {

.kokoro/presubmit/graalvm-native.cfg

Lines changed: 1 addition & 1 deletion
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.32.0"
6+
value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.33.0"
77
}
88

99
env_vars: {

pom.xml

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<parent>
1515
<groupId>com.google.cloud</groupId>
1616
<artifactId>sdk-platform-java-config</artifactId>
17-
<version>3.32.0</version>
17+
<version>3.33.0</version>
1818
</parent>
1919
<developers>
2020
<developer>
@@ -201,6 +201,13 @@
201201
</dependency>
202202

203203
<!-- Add OpenTelemetry implementation and exporters for use in integration tests -->
204+
<!-- TODO: Remove this alpha dependency when the bug in OpenTelemetry has been fixed that makes SdkTracer implement ExtendedTracer -->
205+
<dependency>
206+
<groupId>io.opentelemetry</groupId>
207+
<artifactId>opentelemetry-api-incubator</artifactId>
208+
<version>1.40.0-alpha</version>
209+
<scope>test</scope>
210+
</dependency>
204211
<dependency>
205212
<groupId>io.opentelemetry</groupId>
206213
<artifactId>opentelemetry-sdk</artifactId>

samples/snippets/pom.xml

Lines changed: 1 addition & 1 deletion
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.32.0</version>
12+
<version>3.33.0</version>
1313
<relativePath/>
1414
</parent>
1515

src/test/java/com/google/cloud/spanner/jdbc/it/ITOpenTelemetryTest.java

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@
3838
import com.google.common.collect.Iterables;
3939
import com.google.devtools.cloudtrace.v1.ListTracesRequest;
4040
import io.opentelemetry.api.GlobalOpenTelemetry;
41+
import io.opentelemetry.api.incubator.trace.ExtendedTracer;
4142
import io.opentelemetry.sdk.OpenTelemetrySdk;
4243
import io.opentelemetry.sdk.resources.Resource;
4344
import io.opentelemetry.sdk.trace.SdkTracerProvider;
@@ -79,7 +80,7 @@ public class ITOpenTelemetryTest extends ITAbstractJdbcTest {
7980
private Database database;
8081

8182
@BeforeClass
82-
public static void setupOpenTelemetry() throws IOException {
83+
public static void setupOpenTelemetry() {
8384
assumeFalse("This test requires credentials", EmulatorSpannerHelper.isUsingEmulator());
8485

8586
SpannerOptions options = env.getTestHelper().getOptions();
@@ -103,6 +104,9 @@ public static void setupOpenTelemetry() throws IOException {
103104
.addSpanProcessor(BatchSpanProcessor.builder(traceExporter).build())
104105
.build())
105106
.build();
107+
// TODO: Remove when the bug in OpenTelemetry that has SdkTracer implement ExtendedTracer,
108+
// which is only available in the incubator project.
109+
ExtendedTracer ignore = (ExtendedTracer) openTelemetry.getTracer("foo");
106110
}
107111

108112
@AfterClass
@@ -245,8 +249,6 @@ private void assertTrace(String sql) throws IOException, InterruptedException {
245249
Thread.sleep(5000L);
246250
boolean foundTrace = false;
247251
for (int attempts = 0; attempts < 20; attempts++) {
248-
// Ignore deprecation for now, as there is no alternative offered (yet?).
249-
//noinspection deprecation
250252
ListTracesPagedResponse response =
251253
client.listTraces(
252254
ListTracesRequest.newBuilder()

0 commit comments

Comments
 (0)