Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

deps: update dependency com.google.cloud:sdk-platform-java-config to v3.33.0 #1693

Merged
merged 4 commits into from
Aug 6, 2024
Merged

deps: update dependency com.google.cloud:sdk-platform-java-config to v3.33.0 #1693

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3bbe215
deps: update dependency com.google.cloud:sdk-platform-java-config to …
renovate-bot Jul 25, 2024
59d6caf
deps: add incubator dep needed for test
olavloite Aug 6, 2024
f94aa2e
deps: work around unnecessary dependency
olavloite Aug 6, 2024
07add4b
chore: run formatter
olavloite Aug 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/unmanaged_dependency_check.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion .kokoro/presubmit/graalvm-native-17.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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: {
Expand Down
2 changes: 1 addition & 1 deletion .kokoro/presubmit/graalvm-native.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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: {
Expand Down
9 changes: 8 additions & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<parent>
<groupId>com.google.cloud</groupId>
<artifactId>sdk-platform-java-config</artifactId>
<version>3.32.0</version>
<version>3.33.0</version>
</parent>
<developers>
<developer>
Expand Down Expand Up @@ -214,6 +214,13 @@
</dependency>

<!-- Add OpenTelemetry implementation and exporters for use in integration tests -->
<!-- TODO: Remove this alpha dependency when the bug in OpenTelemetry has been fixed that makes SdkTracer implement ExtendedTracer -->
<dependency>
<groupId>io.opentelemetry</groupId>
<artifactId>opentelemetry-api-incubator</artifactId>
<version>1.40.0-alpha</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>io.opentelemetry</groupId>
<artifactId>opentelemetry-sdk</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion samples/snippets/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<parent>
<groupId>com.google.cloud</groupId>
<artifactId>sdk-platform-java-config</artifactId>
<version>3.32.0</version>
<version>3.33.0</version>
<relativePath/>
</parent>

Expand Down
8 changes: 5 additions & 3 deletions src/test/java/com/google/cloud/spanner/jdbc/it/ITOpenTelemetryTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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();
Expand All @@ -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
Expand Down Expand Up @@ -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()
Expand Down
Loading