Support for Armeria gRPC clients

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

@@ -6,18 +6,19 @@ muzzle {
   pass {
     group.set("com.linecorp.armeria")
     module.set("armeria")
-    versions.set("[1.3.0,)")
+    versions.set("[1.14.0,)")
     assertInverse.set(true)
   }
 }
 
 dependencies {
-  implementation(project(":instrumentation:armeria-1.3:library"))
+  implementation(project(":instrumentation:armeria-1.14:library"))
+  implementation(project(":instrumentation:grpc-1.6:javaagent"))
   testInstrumentation(project(":instrumentation:netty:netty-4.1:javaagent"))
 
-  library("com.linecorp.armeria:armeria:1.3.0")
+  library("com.linecorp.armeria:armeria:1.14.0")
 
-  testImplementation(project(":instrumentation:armeria-1.3:testing"))
+  testImplementation(project(":instrumentation:armeria-1.14:testing"))
 }
 
 tasks {

instrumentation/armeria-1.3/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/armeria/v1_3/AbstractStreamMessageSubscriptionInstrumentation.java → instrumentation/armeria-1.14/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/armeria/v1_14/AbstractStreamMessageSubscriptionInstrumentation.java

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.javaagent.instrumentation.armeria.v1_3;
+package io.opentelemetry.javaagent.instrumentation.armeria.v1_14;
 
 import static net.bytebuddy.matcher.ElementMatchers.isConstructor;
 import static net.bytebuddy.matcher.ElementMatchers.named;

instrumentation/armeria-1.3/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/armeria/v1_3/ArmeriaInstrumentationModule.java → instrumentation/armeria-1.14/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/armeria/v1_14/ArmeriaInstrumentationModule.java

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.javaagent.instrumentation.armeria.v1_3;
+package io.opentelemetry.javaagent.instrumentation.armeria.v1_14;
 
 import static io.opentelemetry.javaagent.extension.matcher.AgentElementMatchers.hasClassesNamed;
 import static java.util.Arrays.asList;
@@ -17,7 +17,7 @@
 @AutoService(InstrumentationModule.class)
 public class ArmeriaInstrumentationModule extends InstrumentationModule {
   public ArmeriaInstrumentationModule() {
-    super("armeria", "armeria-1.3");
+    super("armeria", "armeria-1.14");
   }
 
   @Override

instrumentation/armeria-1.14/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/armeria/v1_14/ArmeriaRpcClientBuilderInstrumentation.java

@@ -0,0 +1,45 @@
+/*
+ * Copyright The OpenTelemetry Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+ package io.opentelemetry.javaagent.instrumentation.armeria.v1_14;
+
+ import static net.bytebuddy.matcher.ElementMatchers.isMethod;
+ import static net.bytebuddy.matcher.ElementMatchers.isPublic;
+ import static net.bytebuddy.matcher.ElementMatchers.named;
+
+ import com.linecorp.armeria.client.grpc.GrpcClientBuilder;
+ import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
+ import io.opentelemetry.javaagent.extension.instrumentation.TypeTransformer;
+ import io.opentelemetry.javaagent.instrumentation.grpc.v1_6.GrpcSingletons
+ import net.bytebuddy.asm.Advice;
+ import net.bytebuddy.description.type.TypeDescription;
+ import net.bytebuddy.matcher.ElementMatcher;
+
+public class ArmeriaRpcClientBuilderInstrumentation implements TypeInstrumentation {
+
+  @Override
+  public ElementMatcher<TypeDescription> typeMatcher() {
+    // we need to update class being targeted
+    return named("com.linecorp.armeria.client.grpc.GrpcClientBuilder");
+  }
+
+  @Override
+  public void transform(TypeTransformer transformer) {
+    transformer.applyAdviceToMethod(
+        isMethod().and(isPublic()).and(named("build")),
+        // reference this class' build advice
+        ArmeriaRpcClientBuilderInstrumentation.class.getName() + "$BuildAdvice");
+  }
+
+  @SuppressWarnings("unused")
+  public static class BuildAdvice {
+
+    @Advice.OnMethodEnter
+    // the the GrpcClientBuilder instead
+    public static void build(@Advice.This GrpcClientBuilder builder) {
+      builder.interceptor(GrpcSingletons.CLIENT_DECORATOR);
+    }
+  }
+}

instrumentation/armeria-1.3/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/armeria/v1_3/ArmeriaServerBuilderInstrumentation.java → instrumentation/armeria-1.14/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/armeria/v1_14/ArmeriaServerBuilderInstrumentation.java

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.javaagent.instrumentation.armeria.v1_3;
+package io.opentelemetry.javaagent.instrumentation.armeria.v1_14;
 
 import static net.bytebuddy.matcher.ElementMatchers.isMethod;
 import static net.bytebuddy.matcher.ElementMatchers.isPublic;

instrumentation/armeria-1.3/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/armeria/v1_3/ArmeriaSingletons.java → instrumentation/armeria-1.14/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/armeria/v1_14/ArmeriaSingletons.java

@@ -3,12 +3,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.javaagent.instrumentation.armeria.v1_3;
+package io.opentelemetry.javaagent.instrumentation.armeria.v1_14;
 
 import com.linecorp.armeria.client.HttpClient;
 import com.linecorp.armeria.server.HttpService;
 import io.opentelemetry.api.GlobalOpenTelemetry;
-import io.opentelemetry.instrumentation.api.instrumenter.http.HttpClientPeerServiceAttributesExtractor;
+import io.opentelemetry.instrumentation.api.instrumenter.net.PeerServiceAttributesExtractor;
 import io.opentelemetry.instrumentation.armeria.v1_3.ArmeriaTelemetry;
 import io.opentelemetry.instrumentation.armeria.v1_3.internal.ArmeriaHttpClientAttributesGetter;
 import io.opentelemetry.javaagent.bootstrap.internal.CommonConfig;
@@ -28,9 +28,9 @@ public final class ArmeriaSingletons {
             .setCapturedClientResponseHeaders(CommonConfig.get().getClientResponseHeaders())
             .setKnownMethods(CommonConfig.get().getKnownHttpRequestMethods())
             .addClientAttributeExtractor(
-                HttpClientPeerServiceAttributesExtractor.create(
+                PeerServiceAttributesExtractor.create(
                     ArmeriaHttpClientAttributesGetter.INSTANCE,
-                    CommonConfig.get().getPeerServiceResolver()))
+                    CommonConfig.get().getPeerServiceMapping()))
             .setEmitExperimentalHttpClientMetrics(
                 CommonConfig.get().shouldEmitExperimentalHttpClientMetrics())
             .setEmitExperimentalHttpServerMetrics(

instrumentation/armeria-1.3/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/armeria/v1_3/ArmeriaWebClientBuilderInstrumentation.java → instrumentation/armeria-1.14/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/armeria/v1_14/ArmeriaWebClientBuilderInstrumentation.java

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.javaagent.instrumentation.armeria.v1_3;
+package io.opentelemetry.javaagent.instrumentation.armeria.v1_14;
 
 import static net.bytebuddy.matcher.ElementMatchers.isMethod;
 import static net.bytebuddy.matcher.ElementMatchers.isPublic;

instrumentation/armeria-1.3/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/armeria/v1_3/CompletableFutureWrapper.java → instrumentation/armeria-1.14/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/armeria/v1_14/CompletableFutureWrapper.java

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.javaagent.instrumentation.armeria.v1_3;
+package io.opentelemetry.javaagent.instrumentation.armeria.v1_14;
 
 import io.opentelemetry.context.Context;
 import io.opentelemetry.context.Scope;

instrumentation/armeria-1.3/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/armeria/v1_3/ServerDecorator.java → instrumentation/armeria-1.14/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/armeria/v1_14/ServerDecorator.java

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.javaagent.instrumentation.armeria.v1_3;
+package io.opentelemetry.javaagent.instrumentation.armeria.v1_14;
 
 import com.linecorp.armeria.common.HttpRequest;
 import com.linecorp.armeria.common.HttpResponse;

instrumentation/armeria-1.3/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/armeria/v1_3/SubscriberWrapper.java → instrumentation/armeria-1.14/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/armeria/v1_14/SubscriberWrapper.java

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.javaagent.instrumentation.armeria.v1_3;
+package io.opentelemetry.javaagent.instrumentation.armeria.v1_14;
 
 import io.opentelemetry.context.Context;
 import io.opentelemetry.context.Scope;

instrumentation/armeria-1.3/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/armeria/v1_3/ArmeriaHttpClientTest.java → instrumentation/armeria-1.14/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/armeria/v1_3/ArmeriaHttpClientTest.java

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.javaagent.instrumentation.armeria.v1_3;
+package io.opentelemetry.javaagent.instrumentation.armeria.v1_14;
 
 import com.linecorp.armeria.client.WebClientBuilder;
 import io.opentelemetry.instrumentation.armeria.v1_3.AbstractArmeriaHttpClientTest;

instrumentation/armeria-1.3/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/armeria/v1_3/ArmeriaHttpServerTest.java → instrumentation/armeria-1.14/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/armeria/v1_3/ArmeriaHttpServerTest.java

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.javaagent.instrumentation.armeria.v1_3;
+package io.opentelemetry.javaagent.instrumentation.armeria.v1_14;
 
 import com.linecorp.armeria.server.ServerBuilder;
 import io.opentelemetry.instrumentation.armeria.v1_3.AbstractArmeriaHttpServerTest;

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

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

instrumentation/armeria-1.3/library/src/main/java/io/opentelemetry/instrumentation/armeria/v1_3/ArmeriaHttpServerAttributesGetter.java → instrumentation/armeria-1.14/library/src/main/java/io/opentelemetry/instrumentation/armeria/v1_14/ArmeriaHttpServerAttributesGetter.java

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.instrumentation.armeria.v1_3;
+package io.opentelemetry.instrumentation.armeria.v1_14;
 
 import com.linecorp.armeria.common.HttpRequest;
 import com.linecorp.armeria.common.HttpStatus;

instrumentation/armeria-1.3/library/src/main/java/io/opentelemetry/instrumentation/armeria/v1_3/ArmeriaTelemetry.java → instrumentation/armeria-1.14/library/src/main/java/io/opentelemetry/instrumentation/armeria/v1_14/ArmeriaTelemetry.java

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.instrumentation.armeria.v1_3;
+package io.opentelemetry.instrumentation.armeria.v1_14;
 
 import com.linecorp.armeria.client.ClientRequestContext;
 import com.linecorp.armeria.client.HttpClient;

instrumentation/armeria-1.3/library/src/main/java/io/opentelemetry/instrumentation/armeria/v1_3/ArmeriaTelemetryBuilder.java → instrumentation/armeria-1.14/library/src/main/java/io/opentelemetry/instrumentation/armeria/v1_14/ArmeriaTelemetryBuilder.java

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.instrumentation.armeria.v1_3;
+package io.opentelemetry.instrumentation.armeria.v1_14;
 
 import com.google.errorprone.annotations.CanIgnoreReturnValue;
 import com.linecorp.armeria.client.ClientRequestContext;
@@ -39,7 +39,7 @@
 
 public final class ArmeriaTelemetryBuilder {
 
-  private static final String INSTRUMENTATION_NAME = "io.opentelemetry.armeria-1.3";
+  private static final String INSTRUMENTATION_NAME = "io.opentelemetry.armeria-1.14";
 
   private final OpenTelemetry openTelemetry;
   @Nullable private String peerService;

instrumentation/armeria-1.3/library/src/main/java/io/opentelemetry/instrumentation/armeria/v1_3/ClientRequestContextSetter.java → instrumentation/armeria-1.14/library/src/main/java/io/opentelemetry/instrumentation/armeria/v1_14/ClientRequestContextSetter.java

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.instrumentation.armeria.v1_3;
+package io.opentelemetry.instrumentation.armeria.v1_14;
 
 import com.linecorp.armeria.client.ClientRequestContext;
 import io.opentelemetry.context.propagation.TextMapSetter;

instrumentation/armeria-1.3/library/src/main/java/io/opentelemetry/instrumentation/armeria/v1_3/OpenTelemetryClient.java → instrumentation/armeria-1.14/library/src/main/java/io/opentelemetry/instrumentation/armeria/v1_14/OpenTelemetryClient.java

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.instrumentation.armeria.v1_3;
+package io.opentelemetry.instrumentation.armeria.v1_14;
 
 import com.linecorp.armeria.client.ClientRequestContext;
 import com.linecorp.armeria.client.HttpClient;

instrumentation/armeria-1.3/library/src/main/java/io/opentelemetry/instrumentation/armeria/v1_3/OpenTelemetryService.java → instrumentation/armeria-1.14/library/src/main/java/io/opentelemetry/instrumentation/armeria/v1_14/OpenTelemetryService.java

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.instrumentation.armeria.v1_3;
+package io.opentelemetry.instrumentation.armeria.v1_14;
 
 import com.linecorp.armeria.common.HttpRequest;
 import com.linecorp.armeria.common.HttpResponse;

instrumentation/armeria-1.3/library/src/main/java/io/opentelemetry/instrumentation/armeria/v1_3/RequestContextGetter.java → instrumentation/armeria-1.14/library/src/main/java/io/opentelemetry/instrumentation/armeria/v1_14/RequestContextGetter.java

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.instrumentation.armeria.v1_3;
+package io.opentelemetry.instrumentation.armeria.v1_14;
 
 import com.linecorp.armeria.server.ServiceRequestContext;
 import io.netty.util.AsciiString;

instrumentation/armeria-1.3/library/src/test/java/io/opentelemetry/instrumentation/armeria/v1_3/ArmeriaHttpClientTest.java → instrumentation/armeria-1.14/library/src/test/java/io/opentelemetry/instrumentation/armeria/v1_14/ArmeriaHttpClientTest.java

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.instrumentation.armeria.v1_3;
+package io.opentelemetry.instrumentation.armeria.v1_14;
 
 import com.linecorp.armeria.client.WebClientBuilder;
 import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension;

instrumentation/armeria-1.3/library/src/test/java/io/opentelemetry/instrumentation/armeria/v1_3/ArmeriaHttpServerTest.java → instrumentation/armeria-1.14/library/src/test/java/io/opentelemetry/instrumentation/armeria/v1_14/ArmeriaHttpServerTest.java

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.instrumentation.armeria.v1_3;
+package io.opentelemetry.instrumentation.armeria.v1_14;
 
 import com.linecorp.armeria.server.ServerBuilder;
 import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension;

instrumentation/armeria-1.14/testing/build.gradle.kts

@@ -0,0 +1,10 @@
+plugins {
+  id("otel.java-conventions")
+}
+
+dependencies {
+  api(project(":testing-common"))
+
+  api("com.linecorp.armeria:armeria:1.14.0")
+  api("com.linecorp.armeria:armeria-junit4:1.14.0")
+}

instrumentation/armeria-1.3/testing/src/main/java/io/opentelemetry/instrumentation/armeria/v1_3/AbstractArmeriaHttpClientTest.java → instrumentation/armeria-1.14/testing/src/main/java/io/opentelemetry/instrumentation/armeria/v1_14/AbstractArmeriaHttpClientTest.java

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.instrumentation.armeria.v1_3;
+package io.opentelemetry.instrumentation.armeria.v1_14;
 
 import static org.assertj.core.api.Assertions.assertThat;
 

instrumentation/armeria-1.3/testing/src/main/java/io/opentelemetry/instrumentation/armeria/v1_3/AbstractArmeriaHttpServerTest.java → instrumentation/armeria-1.14/testing/src/main/java/io/opentelemetry/instrumentation/armeria/v1_14/AbstractArmeriaHttpServerTest.java

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.instrumentation.armeria.v1_3;
+package io.opentelemetry.instrumentation.armeria.v1_14;
 
 import static io.opentelemetry.instrumentation.testing.junit.http.ServerEndpoint.CAPTURE_HEADERS;
 import static io.opentelemetry.instrumentation.testing.junit.http.ServerEndpoint.ERROR;