From e661025db02106cf976d27138710e5689835b829 Mon Sep 17 00:00:00 2001
From: Crypt Keeper <64215+codefromthecrypt@users.noreply.github.com>
Date: Wed, 6 Dec 2023 08:21:09 +0800
Subject: [PATCH] deps: updates to armeria 1.26.3 and netty 4.1.100.Final
 (#3614)

updates armeria and netty to latest and adds missing timeout

Signed-off-by: Adrian Cole <adrian@tetrate.io>
Co-authored-by: Hansel Wei <hello@hanselwei.dev>
---
 pom.xml                                                       | 4 ++--
 .../server/internal/elasticsearch/LazyHttpClientImpl.java     | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 77ab83243d7..a9a0cc126f1 100755
--- a/pom.xml
+++ b/pom.xml
@@ -52,9 +52,9 @@
 
     <!-- This allows you to test feature branches with jitpack -->
     <armeria.groupId>com.linecorp.armeria</armeria.groupId>
-    <armeria.version>1.17.2</armeria.version>
+    <armeria.version>1.26.3</armeria.version>
     <!-- Match Armeria version to avoid conflicts including running tests in the IDE -->
-    <netty.version>4.1.95.Final</netty.version>
+    <netty.version>4.1.100.Final</netty.version>
 
     <!-- It's easy for Jackson dependencies to get misaligned, so we manage it ourselves. -->
     <jackson.version>2.16.0</jackson.version>
diff --git a/zipkin-server/src/main/java/zipkin2/server/internal/elasticsearch/LazyHttpClientImpl.java b/zipkin-server/src/main/java/zipkin2/server/internal/elasticsearch/LazyHttpClientImpl.java
index 2f385a109c3..d58d5b8c73e 100644
--- a/zipkin-server/src/main/java/zipkin2/server/internal/elasticsearch/LazyHttpClientImpl.java
+++ b/zipkin-server/src/main/java/zipkin2/server/internal/elasticsearch/LazyHttpClientImpl.java
@@ -71,6 +71,7 @@ HealthCheckedEndpointGroup decorateHealthCheck(EndpointGroup endpointGroup) {
       HealthCheckedEndpointGroup.builder(endpointGroup, "/_cluster/health")
         .protocol(protocol)
         .useGet(true)
+        .selectionTimeoutMillis(timeoutMillis)
         .clientFactory(factory.clientFactory)
         .withClientOptions(options -> {
           factory.configureHttpLogging(healthCheck.getHttpLogging(), options);