Updates Armeria to 1.26.4. This also updates io.grpc to 1.58.0 which …

…has a slight breaking changing. This is fixed by explicitly adding io.grpc:grpc-inprocess to the build. Signed-off-by: David Venable <[email protected]>
opensearch-project · Jan 4, 2024 · 05aafcb · 05aafcb
1 parent 5ff65a9
commit 05aafcb
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 4 deletions.
diff --git a/data-prepper-plugins/otel-logs-source/build.gradle b/data-prepper-plugins/otel-logs-source/build.gradle
@@ -21,9 +21,10 @@ dependencies {
     implementation 'software.amazon.awssdk:auth'
     implementation 'software.amazon.awssdk:regions'
     implementation 'software.amazon.awssdk:s3'
-    implementation 'com.google.protobuf:protobuf-java-util:3.19.4'
-    implementation 'com.linecorp.armeria:armeria:1.15.0'
-    implementation 'com.linecorp.armeria:armeria-grpc:1.15.0'
+    implementation libs.protobuf.util
+    implementation libs.armeria.core
+    implementation libs.armeria.grpc
+    implementation libs.grpc.inprocess
     implementation 'com.fasterxml.jackson.core:jackson-databind'
     implementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-yaml'
     implementation libs.commons.lang3

diff --git a/data-prepper-plugins/otel-metrics-source/build.gradle b/data-prepper-plugins/otel-metrics-source/build.gradle
@@ -24,6 +24,7 @@ dependencies {
     implementation libs.protobuf.util
     implementation libs.armeria.core
     implementation libs.armeria.grpc
+    implementation libs.grpc.inprocess
     implementation 'com.fasterxml.jackson.core:jackson-databind'
     implementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-yaml'
     implementation libs.commons.lang3

diff --git a/data-prepper-plugins/otel-trace-source/build.gradle b/data-prepper-plugins/otel-trace-source/build.gradle
@@ -22,6 +22,7 @@ dependencies {
     implementation libs.protobuf.util
     implementation libs.armeria.core
     implementation libs.armeria.grpc
+    implementation libs.grpc.inprocess
     implementation 'com.fasterxml.jackson.core:jackson-databind'
     implementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-yaml'
     implementation libs.commons.lang3

diff --git a/settings.gradle b/settings.gradle
@@ -17,10 +17,12 @@ dependencyResolutionManagement {
         libs {
             version('slf4j', '2.0.6')
             library('slf4j-api', 'org.slf4j', 'slf4j-api').versionRef('slf4j')
-            version('armeria', '1.25.2')
+            version('armeria', '1.26.4')
             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')
+            version('grpc', '1.58.0')
+            library('grpc-inprocess', 'io.grpc', 'grpc-inprocess').versionRef('grpc')
             version('protobuf', '3.24.3')
             library('protobuf-core', 'com.google.protobuf', 'protobuf-java').versionRef('protobuf')
             library('protobuf-util', 'com.google.protobuf', 'protobuf-java-util').versionRef('protobuf')