Move armeria instrumentations under common directory (#11385)

docs/supported-libraries.md

@@ -41,7 +41,7 @@ These are the supported libraries and frameworks:
 | [Apache Struts 2](https://github.com/apache/struts)                                                                                         | 2.3+                               | N/A                                                                                                                                                                                                                                                                                                                                                                                     | Provides `http.route` [2], Controller Spans [3]                                                                                         |
 | [Apache Tapestry](https://tapestry.apache.org/)                                                                                             | 5.4+                               | N/A                                                                                                                                                                                                                                                                                                                                                                                     | Provides `http.route` [2], Controller Spans [3]                                                                                         |
 | [Apache Wicket](https://wicket.apache.org/)                                                                                                 | 8.0+                               | N/A                                                                                                                                                                                                                                                                                                                                                                                     | Provides `http.route` [2]                                                                                                               |
-| [Armeria](https://armeria.dev)                                                                                                              | 1.3+                               | [opentelemetry-armeria-1.3](../instrumentation/armeria-1.3/library)                                                                                                                                                                                                                                                                                                                     | [HTTP Client Spans], [HTTP Client Metrics], [HTTP Server Spans], [HTTP Server Metrics]                                                  |
+| [Armeria](https://armeria.dev)                                                                                                              | 1.3+                               | [opentelemetry-armeria-1.3](../instrumentation/armeria/armeria-1.3/library)                                                                                                                                                                                                                                                                                                             | [HTTP Client Spans], [HTTP Client Metrics], [HTTP Server Spans], [HTTP Server Metrics]                                                  |
 | [Armeria gRPC](https://armeria.dev)                                                                                                         | 1.14+                              |                                                                                                                                                                                                                                                                                                                                                                                         | [RPC Client Spans], [RPC Client Metrics], [RPC Server Spans], [RPC Server Metrics]                                                      |
 | [AsyncHttpClient](https://github.com/AsyncHttpClient/async-http-client)                                                                     | 1.9+                               | N/A                                                                                                                                                                                                                                                                                                                                                                                     | [HTTP Client Spans], [HTTP Client Metrics]                                                                                              |
 | [AWS Lambda](https://docs.aws.amazon.com/lambda/latest/dg/java-handler.html)                                                                | 1.0+                               | [opentelemetry-aws-lambda-core-1.0](../instrumentation/aws-lambda/aws-lambda-core-1.0/library),<br>[opentelemetry-aws-lambda-events-2.2](../instrumentation/aws-lambda/aws-lambda-events-2.2/library)                                                                                                                                                                                   | [FaaS Server Spans]                                                                                                                     |

instrumentation/armeria/armeria-1.3/javaagent/build.gradle.kts

@@ -12,13 +12,13 @@ muzzle {
 }
 
 dependencies {
-  implementation(project(":instrumentation:armeria-1.3:library"))
+  implementation(project(":instrumentation:armeria:armeria-1.3:library"))
   testInstrumentation(project(":instrumentation:netty:netty-4.1:javaagent"))
 
   library("com.linecorp.armeria:armeria:1.3.0")
   testLibrary("com.linecorp.armeria:armeria-junit5:1.3.0")
 
-  testImplementation(project(":instrumentation:armeria-1.3:testing"))
+  testImplementation(project(":instrumentation:armeria:armeria-1.3:testing"))
 }
 
 tasks {

instrumentation/armeria/armeria-1.3/library/build.gradle.kts

@@ -6,7 +6,7 @@ plugins {
 dependencies {
   library("com.linecorp.armeria:armeria:1.3.0")
 
-  testImplementation(project(":instrumentation:armeria-1.3:testing"))
+  testImplementation(project(":instrumentation:armeria:armeria-1.3:testing"))
 }
 
 tasks {

settings.gradle.kts

@@ -165,10 +165,10 @@ include(":instrumentation:apache-httpclient:apache-httpclient-4.3:library")
 include(":instrumentation:apache-httpclient:apache-httpclient-4.3:testing")
 include(":instrumentation:apache-httpclient:apache-httpclient-5.0:javaagent")
 include(":instrumentation:apache-httpclient:apache-httpclient-5.2:library")
-include(":instrumentation:armeria-1.3:javaagent")
-include(":instrumentation:armeria-1.3:library")
-include(":instrumentation:armeria-1.3:testing")
-include(":instrumentation:armeria-grpc-1.14:javaagent")
+include(":instrumentation:armeria:armeria-1.3:javaagent")
+include(":instrumentation:armeria:armeria-1.3:library")
+include(":instrumentation:armeria:armeria-1.3:testing")
+include(":instrumentation:armeria:armeria-grpc-1.14:javaagent")
 include(":instrumentation:async-http-client:async-http-client-1.9:javaagent")
 include(":instrumentation:async-http-client:async-http-client-2.0:javaagent")
 include(":instrumentation:aws-lambda:aws-lambda-core-1.0:javaagent")