From 4d10ccfd138caabaf8010bb73cfa3193444f4432 Mon Sep 17 00:00:00 2001 From: Jannik Brand Date: Tue, 9 Dec 2025 15:55:30 +0100 Subject: [PATCH] Update Armeria to 1.32.6 This Armeria patch version was requested explicitly: https://github.com/line/armeria/issues/6733 Fixes #6271 since the current Ameria version is affected by a couple of bugs (see comment https://github.com/opensearch-project/data-prepper/issues/6271#issuecomment-3627395389). 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. Signed-off-by: Jannik Brand --- .../dataprepper/core/meter/EMFLoggingMeterRegistry.java | 2 +- settings.gradle | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/data-prepper-core/src/main/java/org/opensearch/dataprepper/core/meter/EMFLoggingMeterRegistry.java b/data-prepper-core/src/main/java/org/opensearch/dataprepper/core/meter/EMFLoggingMeterRegistry.java index ff8bb9a80d..686ea59877 100644 --- a/data-prepper-core/src/main/java/org/opensearch/dataprepper/core/meter/EMFLoggingMeterRegistry.java +++ b/data-prepper-core/src/main/java/org/opensearch/dataprepper/core/meter/EMFLoggingMeterRegistry.java @@ -24,7 +24,6 @@ import io.micrometer.core.instrument.step.StepMeterRegistry; import io.micrometer.core.instrument.util.NamedThreadFactory; import io.micrometer.core.instrument.util.StringUtils; -import io.micrometer.core.lang.Nullable; import io.micrometer.core.util.internal.logging.WarnThenDebugLogger; import software.amazon.cloudwatchlogs.emf.environment.Environment; import software.amazon.cloudwatchlogs.emf.environment.EnvironmentProvider; @@ -32,6 +31,7 @@ import software.amazon.cloudwatchlogs.emf.model.DimensionSet; import software.amazon.cloudwatchlogs.emf.model.Unit; +import javax.annotation.Nullable; import java.time.Instant; import java.util.Collections; import java.util.HashMap; diff --git a/settings.gradle b/settings.gradle index ca6b64043a..a6537ad06c 100644 --- a/settings.gradle +++ b/settings.gradle @@ -34,7 +34,7 @@ dependencyResolutionManagement { libs { version('slf4j', '2.0.6') library('slf4j-api', 'org.slf4j', 'slf4j-api').versionRef('slf4j') - version('armeria', '1.32.5') + version('armeria', '1.32.6') library('armeria-core', 'com.linecorp.armeria', 'armeria').versionRef('armeria') library('armeria-grpc', 'com.linecorp.armeria', 'armeria-grpc').versionRef('armeria') library('armeria-junit', 'com.linecorp.armeria', 'armeria-junit5').versionRef('armeria')