Merge branch 'main' into Add-RingHash

README.md

@@ -2,13 +2,13 @@ Visit [the official web site](https://armeria.dev/) for more information.
 
 # Armeria
 
-<a href="https://github.com/line/armeria"><img src="https://img.shields.io/github/stars/line/armeria.svg?style=social" /></a>
-<a href="https://twitter.com/armeria_project"><img src="https://img.shields.io/twitter/follow/armeria_project.svg?label=Follow" /></a>
-<a href="https://armeria.dev/s/discord"><img src="https://img.shields.io/badge/chat-on%20Discord-brightgreen.svg?style=social&amp;logo=discord" /></a>
-<a href="https://github.com/line/armeria/contributors"><img src="https://img.shields.io/github/contributors/line/armeria.svg" /></a>
-<a href="https://github.com/line/armeria/pulse"><img src="https://img.shields.io/github/commit-activity/m/line/armeria.svg?label=commits" /></a>
-<a href="https://search.maven.org/search?q=g:com.linecorp.armeria%20AND%20a:armeria"><img src="https://img.shields.io/maven-central/v/com.linecorp.armeria/armeria.svg?label=version" /></a>
-<a href="https://github.com/line/armeria/commits"><img src="https://img.shields.io/github/release-date/line/armeria.svg?label=release" /></a>
+[![GitHub stars](https://img.shields.io/github/stars/line/armeria.svg?style=social)](https://github.com/line/armeria)
+[![Twitter Follow](https://img.shields.io/twitter/follow/armeria_project.svg?label=Follow)](https://twitter.com/armeria_project)
+[![Discord](https://img.shields.io/badge/chat-on%20Discord-brightgreen.svg?style=social&logo=discord)](https://armeria.dev/s/discord)
+[![GitHub contributors](https://img.shields.io/github/contributors/line/armeria.svg)](https://github.com/line/armeria/contributors)
+[![GitHub commit activity](https://img.shields.io/github/commit-activity/m/line/armeria.svg?label=commits)](https://github.com/line/armeria/pulse)
+[![Maven Central](https://img.shields.io/maven-central/v/com.linecorp.armeria/armeria.svg?label=version)](https://search.maven.org/search?q=g:com.linecorp.armeria%20AND%20a:armeria)
+[![GitHub release date](https://img.shields.io/github/release-date/line/armeria.svg?label=release)](https://github.com/line/armeria/commits)
 [![Revved up by Develocity](https://img.shields.io/badge/Revved%20up%20by-Develocity-06A0CE?logo=Gradle&labelColor=02303A)](https://ge.armeria.dev/scans)
 
 

core/src/main/java/com/linecorp/armeria/server/auth/OAuth2TokenExtractor.java

@@ -61,7 +61,7 @@ public OAuth2Token apply(RequestHeaders headers) {
 
  final Matcher matcher = AUTHORIZATION_HEADER_PATTERN.matcher(authorization);
  if (!matcher.matches()) {
- logger.warn("Invalid authorization header: " + authorization);
+ logger.debug("Invalid authorization header: {}", authorization);
  return null;
  }
 

core/src/main/resources/com/linecorp/armeria/public_suffixes.txt

@@ -125,12 +125,10 @@
 *.r.appspot.com
 *.run.app
 *.s.brave.io
-*.s5y.io
 *.sa-east-1.airflow.amazonaws.com
 *.sapporo.jp
 *.sch.uk
 *.sendai.jp
-*.sensiosite.cloud
 *.services.clever-cloud.com
 *.snowflake.app
 *.spectrum.myjino.ru
@@ -3653,6 +3651,7 @@ hoylandet.no
 hr
 hr.eu.org
 hra.health
+hrsn.dev
 hs.kr
 hs.run
 hs.zone
@@ -4582,7 +4581,6 @@ kropyvnytskyi.ua
 krym.ua
 ks.ua
 ks.us
-ktistory.com
 kuchinotsu.nagasaki.jp
 kudamatsu.yamaguchi.jp
 kudoyama.wakayama.jp
@@ -5117,6 +5115,7 @@ memset.net
 men
 menu
 meraker.no
+merck
 merckmsd
 merseine.nu
 messerli.app
@@ -5474,7 +5473,6 @@ my.id
 myactivedirectory.com
 myamaze.net
 myasustor.com
-mycd.eu
 mycloudnas.com
 mydatto.com
 mydatto.net
@@ -8128,6 +8126,7 @@ szczytno.pl
 szex.hu
 szkola.pl
 t.bg
+t.hrsn.dev
 t.hrsn.net
 t.se
 ta.it

core/src/test/java/com/linecorp/armeria/server/ServerBuilderTest.java

@@ -37,6 +37,7 @@
 import java.util.function.Supplier;
 
 import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
@@ -143,6 +144,13 @@ private static Server newServerWithKeepAlive(long idleTimeoutMillis, long pingIn
  .build();
  }
 
+ @AfterEach
+ void tearDown() {
+ poppedRouterCnt.set(0);
+ poppedRouterCnt2.set(0);
+ poppedCnt.set(0);
+ }
+
  @Test
  void acceptDuplicatePort() throws Exception {
  final Server server = Server.builder()