Skip to content

Commit 59326bd

Browse files
committed
Update Armeria to 1.32.6
This Armeria patch version was requested explicitly: line/armeria#6733 Fixes #6271 since the current Ameria version is affected by a couple of bugs (see comment #6271 (comment)). Furthermore, replace io.micrometer.core.lang annotation which is going to be deprecated in Micrometer 1.16.0 - see release notes: https://github.com/micrometer-metrics/micrometer/releases/tag/v1.16.0. Fix Mockito strict stubbing in DynamoDbClientWrapperTest Signed-off-by: Jannik Brand <jannik.brand@sap.com>
1 parent d1e8758 commit 59326bd

3 files changed

Lines changed: 4 additions & 3 deletions

File tree

data-prepper-core/src/main/java/org/opensearch/dataprepper/core/meter/EMFLoggingMeterRegistry.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,14 @@
2424
import io.micrometer.core.instrument.step.StepMeterRegistry;
2525
import io.micrometer.core.instrument.util.NamedThreadFactory;
2626
import io.micrometer.core.instrument.util.StringUtils;
27-
import io.micrometer.core.lang.Nullable;
2827
import io.micrometer.core.util.internal.logging.WarnThenDebugLogger;
2928
import software.amazon.cloudwatchlogs.emf.environment.Environment;
3029
import software.amazon.cloudwatchlogs.emf.environment.EnvironmentProvider;
3130
import software.amazon.cloudwatchlogs.emf.logger.MetricsLogger;
3231
import software.amazon.cloudwatchlogs.emf.model.DimensionSet;
3332
import software.amazon.cloudwatchlogs.emf.model.Unit;
3433

34+
import javax.annotation.Nullable;
3535
import java.time.Instant;
3636
import java.util.Collections;
3737
import java.util.HashMap;

data-prepper-plugins/dynamodb-source-coordination-store/src/test/java/org/opensearch/dataprepper/plugins/sourcecoordinator/dynamodb/DynamoDbClientWrapperTest.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,7 @@
7070
import static org.mockito.BDDMockito.given;
7171
import static org.mockito.Mockito.doNothing;
7272
import static org.mockito.Mockito.doThrow;
73+
import static org.mockito.Mockito.lenient;
7374
import static org.mockito.Mockito.mock;
7475
import static org.mockito.Mockito.mockStatic;
7576
import static org.mockito.Mockito.never;
@@ -842,7 +843,7 @@ void tryDeletePartition_item_success_calls_delete_on_correct_item() throws NoSuc
842843
@Test
843844
void tryDeletePartition_with_exception_throws_PartitionUpdateException() throws NoSuchFieldException, IllegalAccessException {
844845
final DynamoDbTable<DynamoDbSourcePartitionItem> table = mock(DynamoDbTable.class);
845-
when(table.deleteItem(any(DeleteItemEnhancedRequest.class))).thenThrow(RuntimeException.class);
846+
lenient().when(table.deleteItem(any(DeleteItemEnhancedRequest.class))).thenThrow(RuntimeException.class);
846847

847848
final DynamoDbClientWrapper objectUnderTest = createObjectUnderTest();
848849

settings.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ dependencyResolutionManagement {
3434
libs {
3535
version('slf4j', '2.0.6')
3636
library('slf4j-api', 'org.slf4j', 'slf4j-api').versionRef('slf4j')
37-
version('armeria', '1.32.5')
37+
version('armeria', '1.32.6')
3838
library('armeria-core', 'com.linecorp.armeria', 'armeria').versionRef('armeria')
3939
library('armeria-grpc', 'com.linecorp.armeria', 'armeria-grpc').versionRef('armeria')
4040
library('armeria-junit', 'com.linecorp.armeria', 'armeria-junit5').versionRef('armeria')

0 commit comments

Comments
 (0)