From 3bbe215bca5be04605d3901d4c384645dd52852b Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Thu, 25 Jul 2024 22:30:04 +0000 Subject: [PATCH 1/4] deps: update dependency com.google.cloud:sdk-platform-java-config to v3.33.0 --- .github/workflows/unmanaged_dependency_check.yaml | 2 +- .kokoro/presubmit/graalvm-native-17.cfg | 2 +- .kokoro/presubmit/graalvm-native.cfg | 2 +- pom.xml | 2 +- samples/snippets/pom.xml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) 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..a47dd27ee 100644 --- a/pom.xml +++ b/pom.xml @@ -14,7 +14,7 @@ com.google.cloud sdk-platform-java-config - 3.32.0 + 3.33.0 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 From 59d6caf9852b87a5b71a49b82f2f276305681e67 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Knut=20Olav=20L=C3=B8ite?= Date: Tue, 6 Aug 2024 19:00:23 +0200 Subject: [PATCH 2/4] deps: add incubator dep needed for test --- pom.xml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pom.xml b/pom.xml index a47dd27ee..dd8cc16c5 100644 --- a/pom.xml +++ b/pom.xml @@ -214,6 +214,12 @@ + + io.opentelemetry + opentelemetry-api-incubator + 1.40.0-alpha + test + io.opentelemetry opentelemetry-sdk From f94aa2eb818c5910199c4e9091b03cde9db3372b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Knut=20Olav=20L=C3=B8ite?= Date: Tue, 6 Aug 2024 19:18:24 +0200 Subject: [PATCH 3/4] deps: work around unnecessary dependency --- pom.xml | 1 + .../cloud/spanner/jdbc/it/ITOpenTelemetryTest.java | 9 ++++++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index dd8cc16c5..9f4bc350b 100644 --- a/pom.xml +++ b/pom.xml @@ -214,6 +214,7 @@ + io.opentelemetry opentelemetry-api-incubator 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..b21f961d6 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,8 @@ 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.api.trace.Tracer; import io.opentelemetry.sdk.OpenTelemetrySdk; import io.opentelemetry.sdk.resources.Resource; import io.opentelemetry.sdk.trace.SdkTracerProvider; @@ -79,7 +81,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 +105,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 +250,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() From 07add4be96d77053c24a0273f111b2d5b902571a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Knut=20Olav=20L=C3=B8ite?= Date: Tue, 6 Aug 2024 19:20:01 +0200 Subject: [PATCH 4/4] chore: run formatter --- .../com/google/cloud/spanner/jdbc/it/ITOpenTelemetryTest.java | 1 - 1 file changed, 1 deletion(-) 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 b21f961d6..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 @@ -39,7 +39,6 @@ import com.google.devtools.cloudtrace.v1.ListTracesRequest; import io.opentelemetry.api.GlobalOpenTelemetry; import io.opentelemetry.api.incubator.trace.ExtendedTracer; -import io.opentelemetry.api.trace.Tracer; import io.opentelemetry.sdk.OpenTelemetrySdk; import io.opentelemetry.sdk.resources.Resource; import io.opentelemetry.sdk.trace.SdkTracerProvider;