deps: bump com.google.cloud:libraries-bom from 26.49.0 to 26.51.0 (#3396

) * 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](googleapis/java-cloud-bom@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] <[email protected]> * add additional mock * remove redundant null-checker (and avoid ImpossibleNullComparison) * add openteletry-bom * add additional mock --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Jin Seop Kim <[email protected]> Co-authored-by: Joe Wang <[email protected]>
GoogleCloudPlatform · Dec 6, 2024 · cb9f218 · cb9f218
1 parent 85a48d9
commit cb9f218
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 6 deletions.
diff --git a/...re/src/test/java/com/google/cloud/spring/autoconfigure/trace/pubsub/TraceHelperTests.java b/...re/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");
   }
 

diff --git a/spring-cloud-gcp-dependencies/pom.xml b/spring-cloud-gcp-dependencies/pom.xml
@@ -34,10 +34,11 @@
 	</distributionManagement>
 
 	<properties>
-		<gcp-libraries-bom.version>26.49.0</gcp-libraries-bom.version>
+		<gcp-libraries-bom.version>26.51.0</gcp-libraries-bom.version>
 		<cloud-sql-socket-factory.version>1.21.0</cloud-sql-socket-factory.version>
 		<r2dbc-postgres-driver.version>1.0.7.RELEASE</r2dbc-postgres-driver.version>
 		<cloud-spanner-r2dbc.version>1.3.0</cloud-spanner-r2dbc.version>
+		<opentelemetry.version>1.42.1</opentelemetry.version>
 	</properties>
 
 	<dependencyManagement>
@@ -276,6 +277,14 @@
 				<artifactId>cloud-spanner-r2dbc</artifactId>
 				<version>${cloud-spanner-r2dbc.version}</version>
 			</dependency>
+			<!-- spring dependency overrides -->
+			<dependency>
+				<groupId>io.opentelemetry</groupId>
+				<artifactId>opentelemetry-bom</artifactId>
+				<version>${opentelemetry.version}</version>
+				<type>pom</type>
+				<scope>import</scope>
+			</dependency>
 
 			<!--Google Cloud Libraries BOM -->
 			<dependency>

diff --git a/...ub/src/test/java/com/google/cloud/spring/pubsub/support/DefaultPublisherFactoryTests.java b/...ub/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);

diff --git a/...ter/src/test/java/com/google/cloud/language/v2/spring/LanguageAutoConfigurationTests.java b/...ter/src/test/java/com/google/cloud/language/v2/spring/LanguageAutoConfigurationTests.java
@@ -18,6 +18,7 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyBoolean;
 import static org.mockito.Mockito.when;
 
 import com.google.api.gax.core.CredentialsProvider;
@@ -53,10 +54,14 @@ class LanguageAutoConfigurationTests {
   private static final String TRANSPORT_CHANNEL_PROVIDER_QUALIFIER_NAME =
       "defaultLanguageServiceTransportChannelProvider";
 
-  @Mock private TransportChannel mockTransportChannel;
-  @Mock private ApiCallContext mockApiCallContext;
-  @Mock private TransportChannelProvider mockTransportChannelProvider;
-  @Mock private CredentialsProvider mockCredentialsProvider;
+  @Mock
+  private TransportChannel mockTransportChannel;
+  @Mock
+  private ApiCallContext mockApiCallContext;
+  @Mock
+  private TransportChannelProvider mockTransportChannelProvider;
+  @Mock
+  private CredentialsProvider mockCredentialsProvider;
 
   private ApplicationContextRunner contextRunner =
       new ApplicationContextRunner()
@@ -192,6 +197,8 @@ void testExecutorThreadCountFromProperties() {
   void testCustomTransportChannelProviderUsedWhenProvided() throws IOException {
     when(mockTransportChannelProvider.getTransportName()).thenReturn("grpc");
     when(mockTransportChannelProvider.getTransportChannel()).thenReturn(mockTransportChannel);
+    when(mockTransportChannelProvider.withUseS2A(anyBoolean()))
+        .thenReturn(mockTransportChannelProvider);
     when(mockTransportChannel.getEmptyCallContext()).thenReturn(mockApiCallContext);
     when(mockApiCallContext.withCredentials(any())).thenReturn(mockApiCallContext);
     when(mockApiCallContext.withTransportChannel(any())).thenReturn(mockApiCallContext);