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

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

Merged
merged 5 commits into from
Dec 6, 2024
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6c030d6
deps: bump com.google.cloud:libraries-bom from 26.49.0 to 26.51.0
dependabot[bot] Dec 5, 2024
889ac6e
add additional mock
jinseopkim0 Dec 5, 2024
06a397a
remove redundant null-checker (and avoid ImpossibleNullComparison)
jinseopkim0 Dec 5, 2024
9306d61
add openteletry-bom
JoeWang1127 Dec 6, 2024
e22b374
add additional mock
JoeWang1127 Dec 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
1 change: 0 additions & 1 deletion ...re/src/test/java/com/google/cloud/spring/autoconfigure/trace/pubsub/TraceHelperTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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");
}

Expand Down
11 changes: 10 additions & 1 deletion spring-cloud-gcp-dependencies/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down
2 changes: 2 additions & 0 deletions ...ub/src/test/java/com/google/cloud/spring/pubsub/support/DefaultPublisherFactoryTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -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);
Expand Down
15 changes: 11 additions & 4 deletions ...ter/src/test/java/com/google/cloud/language/v2/spring/LanguageAutoConfigurationTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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()
Expand Down Expand Up @@ -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);
Expand Down
Loading