diff --git a/.github/workflows/unmanaged_dependency_check.yaml b/.github/workflows/unmanaged_dependency_check.yaml index 8eb9dfbd6..09f954387 100644 --- a/.github/workflows/unmanaged_dependency_check.yaml +++ b/.github/workflows/unmanaged_dependency_check.yaml @@ -14,6 +14,6 @@ jobs: shell: bash run: .kokoro/build.sh - name: Unmanaged dependency check - uses: googleapis/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check@google-cloud-shared-dependencies/v3.32.0 + uses: googleapis/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check@google-cloud-shared-dependencies/v3.33.0 with: bom-path: pom.xml diff --git a/.kokoro/presubmit/graalvm-native-17.cfg b/.kokoro/presubmit/graalvm-native-17.cfg index 7d5ab3a25..7008a7215 100644 --- a/.kokoro/presubmit/graalvm-native-17.cfg +++ b/.kokoro/presubmit/graalvm-native-17.cfg @@ -3,7 +3,7 @@ # Configure the docker image for kokoro-trampoline. env_vars: { key: "TRAMPOLINE_IMAGE" - value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.32.0" + value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.33.0" } env_vars: { diff --git a/.kokoro/presubmit/graalvm-native.cfg b/.kokoro/presubmit/graalvm-native.cfg index 519c2e3ce..931f9bb00 100644 --- a/.kokoro/presubmit/graalvm-native.cfg +++ b/.kokoro/presubmit/graalvm-native.cfg @@ -3,7 +3,7 @@ # Configure the docker image for kokoro-trampoline. env_vars: { key: "TRAMPOLINE_IMAGE" - value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.32.0" + value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.33.0" } env_vars: { diff --git a/pom.xml b/pom.xml index 9cece1c6b..9f4bc350b 100644 --- a/pom.xml +++ b/pom.xml @@ -14,7 +14,7 @@ com.google.cloud sdk-platform-java-config - 3.32.0 + 3.33.0 @@ -214,6 +214,13 @@ + + + io.opentelemetry + opentelemetry-api-incubator + 1.40.0-alpha + test + io.opentelemetry opentelemetry-sdk diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml index 0c3b12de9..ee6deda8b 100644 --- a/samples/snippets/pom.xml +++ b/samples/snippets/pom.xml @@ -9,7 +9,7 @@ com.google.cloud sdk-platform-java-config - 3.32.0 + 3.33.0 diff --git a/src/test/java/com/google/cloud/spanner/jdbc/it/ITOpenTelemetryTest.java b/src/test/java/com/google/cloud/spanner/jdbc/it/ITOpenTelemetryTest.java index 19fb1146e..bbbbaf344 100644 --- a/src/test/java/com/google/cloud/spanner/jdbc/it/ITOpenTelemetryTest.java +++ b/src/test/java/com/google/cloud/spanner/jdbc/it/ITOpenTelemetryTest.java @@ -38,6 +38,7 @@ import com.google.common.collect.Iterables; import com.google.devtools.cloudtrace.v1.ListTracesRequest; import io.opentelemetry.api.GlobalOpenTelemetry; +import io.opentelemetry.api.incubator.trace.ExtendedTracer; import io.opentelemetry.sdk.OpenTelemetrySdk; import io.opentelemetry.sdk.resources.Resource; import io.opentelemetry.sdk.trace.SdkTracerProvider; @@ -79,7 +80,7 @@ public class ITOpenTelemetryTest extends ITAbstractJdbcTest { private Database database; @BeforeClass - public static void setupOpenTelemetry() throws IOException { + public static void setupOpenTelemetry() { assumeFalse("This test requires credentials", EmulatorSpannerHelper.isUsingEmulator()); SpannerOptions options = env.getTestHelper().getOptions(); @@ -103,6 +104,9 @@ public static void setupOpenTelemetry() throws IOException { .addSpanProcessor(BatchSpanProcessor.builder(traceExporter).build()) .build()) .build(); + // TODO: Remove when the bug in OpenTelemetry that has SdkTracer implement ExtendedTracer, + // which is only available in the incubator project. + ExtendedTracer ignore = (ExtendedTracer) openTelemetry.getTracer("foo"); } @AfterClass @@ -245,8 +249,6 @@ private void assertTrace(String sql) throws IOException, InterruptedException { Thread.sleep(5000L); boolean foundTrace = false; for (int attempts = 0; attempts < 20; attempts++) { - // Ignore deprecation for now, as there is no alternative offered (yet?). - //noinspection deprecation ListTracesPagedResponse response = client.listTraces( ListTracesRequest.newBuilder()