From 149faa486a7de87f0f008612c48817e0b4516194 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 5 Dec 2024 04:38:39 +0000 Subject: [PATCH 1/3] deps: bump com.google.cloud:libraries-bom from 26.49.0 to 26.51.0 Bumps [com.google.cloud:libraries-bom](https://github.com/googleapis/java-cloud-bom) from 26.49.0 to 26.51.0. - [Release notes](https://github.com/googleapis/java-cloud-bom/releases) - [Changelog](https://github.com/googleapis/java-cloud-bom/blob/main/release-please-config.json) - [Commits](https://github.com/googleapis/java-cloud-bom/compare/v26.49.0...v26.51.0) --- updated-dependencies: - dependency-name: com.google.cloud:libraries-bom dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- spring-cloud-gcp-dependencies/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-cloud-gcp-dependencies/pom.xml b/spring-cloud-gcp-dependencies/pom.xml index ce43e79b22..0a9f68a1f7 100644 --- a/spring-cloud-gcp-dependencies/pom.xml +++ b/spring-cloud-gcp-dependencies/pom.xml @@ -29,7 +29,7 @@ - 26.49.0 + 26.51.0 1.20.1 0.9.7 0.8.13.RELEASE From b06028a81cfbb66af53285622643dccb50c94849 Mon Sep 17 00:00:00 2001 From: Joe Wang Date: Thu, 5 Dec 2024 13:07:10 -0500 Subject: [PATCH 2/3] add addition mock --- .../spring/pubsub/support/DefaultPublisherFactoryTests.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/spring-cloud-gcp-pubsub/src/test/java/com/google/cloud/spring/pubsub/support/DefaultPublisherFactoryTests.java b/spring-cloud-gcp-pubsub/src/test/java/com/google/cloud/spring/pubsub/support/DefaultPublisherFactoryTests.java index 1fc4e7df42..71b94953a1 100644 --- a/spring-cloud-gcp-pubsub/src/test/java/com/google/cloud/spring/pubsub/support/DefaultPublisherFactoryTests.java +++ b/spring-cloud-gcp-pubsub/src/test/java/com/google/cloud/spring/pubsub/support/DefaultPublisherFactoryTests.java @@ -19,6 +19,7 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyBoolean; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; @@ -46,6 +47,7 @@ public void setUp() throws IOException { factory.setCredentialsProvider(NoCredentialsProvider.create()); TransportChannelProvider mockChannelProvider = mock(TransportChannelProvider.class); TransportChannel mockTransportChannel = mock(TransportChannel.class); + when(mockChannelProvider.withUseS2A(anyBoolean())).thenReturn(mockChannelProvider); when(mockChannelProvider.getTransportChannel()).thenReturn(mockTransportChannel); ApiCallContext mockContext = mock(ApiCallContext.class); when(mockTransportChannel.getEmptyCallContext()).thenReturn(mockContext); From 741e908ecb8a73ad68505d5d6e8a1f6841474c3d Mon Sep 17 00:00:00 2001 From: Joe Wang Date: Thu, 5 Dec 2024 13:07:23 -0500 Subject: [PATCH 3/3] remove redundant assert --- .../spring/autoconfigure/trace/pubsub/TraceHelperTests.java | 1 - 1 file changed, 1 deletion(-) diff --git a/spring-cloud-gcp-autoconfigure/src/test/java/com/google/cloud/spring/autoconfigure/trace/pubsub/TraceHelperTests.java b/spring-cloud-gcp-autoconfigure/src/test/java/com/google/cloud/spring/autoconfigure/trace/pubsub/TraceHelperTests.java index 648d449d49..44794b52b2 100644 --- a/spring-cloud-gcp-autoconfigure/src/test/java/com/google/cloud/spring/autoconfigure/trace/pubsub/TraceHelperTests.java +++ b/spring-cloud-gcp-autoconfigure/src/test/java/com/google/cloud/spring/autoconfigure/trace/pubsub/TraceHelperTests.java @@ -66,7 +66,6 @@ void should_inject_child_context() { assertThat(producerSpan.kind()).isEqualTo(PRODUCER); assertChildOf(producerSpan, parent); assertThat(instrumentedMessage.getAttributesMap()) - .isNotNull() .containsEntry("b3", producerSpan.traceId() + "-" + producerSpan.id() + "-1"); }