+ kamon-armeria module

build.sbt

@@ -145,7 +145,8 @@ val instrumentationProjects = Seq[ProjectReference](
   `kamon-lagom`,
   `kamon-finagle`,
   `kamon-aws-sdk`,
-  `kamon-alpakka-kafka`
+  `kamon-alpakka-kafka`,
+  `kamon-armeria`
 )
 
 lazy val instrumentation = (project in file("instrumentation"))
@@ -656,6 +657,41 @@ lazy val `kamon-alpakka-kafka` = (project in file("instrumentation/kamon-alpakka
     )
   ).dependsOn(`kamon-core`, `kamon-akka`, `kamon-testkit` % "test")
 
+lazy val `kamon-armeria` = (project in file("instrumentation/kamon-armeria"))
+  .disablePlugins(AssemblyPlugin)
+  .enablePlugins(JavaAgent)
+  .settings(instrumentationSettings)
+  .settings(
+    libraryDependencies ++= {
+      val grpcDependencies = {
+        CrossVersion.partialVersion(scalaVersion.value) match {
+          case Some((2, n)) if n >= 12 =>
+            Seq(
+              "com.linecorp.armeria" % "armeria-grpc" % "1.20.0" % "test",
+              "com.thesamet.scalapb" %% "scalapb-runtime-grpc" % scalapb.compiler.Version.scalapbVersion % "test"
+            )
+          case _ => Nil // ignore this dependencies on scala 2.11 test because test will be ignored and this dependency scalapb-runtime-grpc is no available anymore
+        }
+      }
+      Seq(
+        kanelaAgent % "provided",
+        "com.linecorp.armeria" % "armeria" % "1.20.0" % "provided",
+
+        scalatest % "test",
+        logbackClassic % "test"
+      ) ++ grpcDependencies
+    },
+    Test / skip := {
+      CrossVersion.partialVersion(scalaVersion.value) match {
+        case Some((2, n)) if n >= 12 => false
+        case _                       => true // skip scala 2.11 tests because of compatibility issues with protobuf
+    }
+    },
+    Test / PB.protoSources := Seq(file("instrumentation/kamon-armeria/src/test/protobuf")),
+    Test / PB.targets := Seq(scalapb.gen() -> (Test / sourceManaged).value)
+  )
+  .dependsOn(`kamon-instrumentation-common`, `kamon-testkit` % "test")
+
 /**
  * Reporters
  */
@@ -931,7 +967,8 @@ lazy val `kamon-bundle-dependencies-all` = (project in file("bundle/kamon-bundle
     `kamon-okhttp`,
     `kamon-caffeine`,
     `kamon-lagom`,
-    `kamon-aws-sdk`
+    `kamon-aws-sdk`,
+    `kamon-armeria`
   )
 
 /**
@@ -954,7 +991,8 @@ lazy val `kamon-bundle-dependencies-2-12-and-up` = (project in file("bundle/kamo
     `kamon-cats-io-3`,
     `kamon-finagle`,
     `kamon-tapir`,
-    `kamon-alpakka-kafka`
+    `kamon-alpakka-kafka`,
+    `kamon-armeria`
   )
 
 lazy val `kamon-bundle` = (project in file("bundle/kamon-bundle"))

instrumentation/kamon-armeria/src/main/java/kamon/instrumentation/armeria/client/ArmeriaHttpClientDecorator.java

@@ -0,0 +1,56 @@
+/* =========================================================================================
+ * Copyright © 2013-2020 the kamon project <http://kamon.io/>
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License") you may not use this file
+ * except in compliance with the License. You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the
+ * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific language governing permissions
+ * and limitations under the License.
+ * =========================================================================================
+ */
+
+package kamon.instrumentation.armeria.client;
+
+import com.linecorp.armeria.client.ClientRequestContext;
+import com.linecorp.armeria.client.HttpClient;
+import com.linecorp.armeria.client.SimpleDecoratingHttpClient;
+import com.linecorp.armeria.common.HttpRequest;
+import com.linecorp.armeria.common.HttpResponse;
+import kamon.Kamon;
+import kamon.instrumentation.armeria.client.timing.Timing;
+import kamon.instrumentation.armeria.converters.KamonArmeriaMessageConverter;
+import kamon.instrumentation.http.HttpClientInstrumentation;
+
+public class ArmeriaHttpClientDecorator extends SimpleDecoratingHttpClient {
+  private final HttpClientInstrumentation clientInstrumentation;
+
+  protected ArmeriaHttpClientDecorator(HttpClient delegate, HttpClientInstrumentation clientInstrumentation) {
+    super(delegate);
+    this.clientInstrumentation = clientInstrumentation;
+  }
+
+  @Override
+  public HttpResponse execute(ClientRequestContext ctx, HttpRequest req) throws Exception {
+
+    final HttpClientInstrumentation.RequestHandler<HttpRequest> requestHandler =
+        clientInstrumentation.createHandler(KamonArmeriaMessageConverter.getRequestBuilder(req), Kamon.currentContext());
+
+    ctx.log()
+        .whenComplete()
+        .thenAccept(log -> {
+            Timing.takeTimings(log, requestHandler.span());
+            requestHandler.processResponse(KamonArmeriaMessageConverter.toKamonResponse(log));
+        });
+
+    try {
+      return unwrap().execute(ctx, requestHandler.request());
+    } catch (Exception exception) {
+      requestHandler.span().fail(exception.getMessage(), exception).finish();
+      throw exception;
+    }
+  }
+}

instrumentation/kamon-armeria/src/main/java/kamon/instrumentation/armeria/client/timing/Timing.java

@@ -0,0 +1,73 @@
+/* =========================================================================================
+ * Copyright © 2013-2020 the kamon project <http://kamon.io/>
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License") you may not use this file
+ * except in compliance with the License. You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the
+ * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific language governing permissions
+ * and limitations under the License.
+ * =========================================================================================
+ */
+
+package kamon.instrumentation.armeria.client.timing;
+
+import com.linecorp.armeria.common.logging.ClientConnectionTimings;
+import com.linecorp.armeria.common.logging.RequestLog;
+import kamon.Kamon;
+import kamon.trace.Span;
+
+import java.util.concurrent.TimeUnit;
+
+/**
+ * Based on Armeria
+ * <a href="https://github.com/line/armeria/blob/master/brave/src/main/java/com/linecorp/armeria/client/brave/BraveClient.java">BraveClient</a>
+ * implementation.
+ */
+public final class Timing {
+
+  public static void takeTimings(RequestLog log, Span span) {
+    ClientConnectionTimings timings = log.connectionTimings();
+    if (timings != null) {
+
+      logTiming(span, "connection-acquire.start", "connection-acquire.end",
+          timings.connectionAcquisitionStartTimeMicros(),
+          timings.connectionAcquisitionDurationNanos());
+
+      if (timings.dnsResolutionDurationNanos() != -1) {
+        logTiming(span, "dns-resolve.start", "dns-resolve.end",
+            timings.dnsResolutionStartTimeMicros(),
+            timings.dnsResolutionDurationNanos());
+      }
+
+      if (timings.socketConnectDurationNanos() != -1) {
+        logTiming(span, "socket-connect.start", "socket-connect.end",
+            timings.socketConnectStartTimeMicros(),
+            timings.socketConnectDurationNanos());
+      }
+
+      if (timings.pendingAcquisitionDurationNanos() != -1) {
+        logTiming(span, "connection-reuse.start", "connection-reuse.end",
+            timings.pendingAcquisitionStartTimeMicros(),
+            timings.pendingAcquisitionDurationNanos());
+      }
+    }
+  }
+
+  private static void logTiming(Span span,
+                                String startName,
+                                String endName,
+                                long startTimeMicros,
+                                long durationNanos) {
+
+    final long startTimeNanos = TimeUnit.NANOSECONDS.convert(startTimeMicros, TimeUnit.MICROSECONDS);
+
+    span.mark(startName, Kamon.clock().toInstant(startTimeNanos));
+    span.mark(endName, Kamon.clock().toInstant(startTimeNanos + durationNanos));
+  }
+
+
+}

instrumentation/kamon-armeria/src/main/java/kamon/instrumentation/armeria/server/ArmeriaHttpServerDecorator.java

@@ -0,0 +1,80 @@
+/* =========================================================================================
+ * Copyright © 2013-2020 the kamon project <http://kamon.io/>
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License") you may not use this file
+ * except in compliance with the License. You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the
+ * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific language governing permissions
+ * and limitations under the License.
+ * =========================================================================================
+ */
+
+package kamon.instrumentation.armeria.server;
+
+import com.linecorp.armeria.common.HttpRequest;
+import com.linecorp.armeria.common.HttpResponse;
+import com.linecorp.armeria.server.HttpService;
+import com.linecorp.armeria.server.ServiceRequestContext;
+import com.linecorp.armeria.server.SimpleDecoratingHttpService;
+import io.netty.util.AttributeKey;
+import kamon.Kamon;
+import kamon.context.Context;
+import kamon.context.Storage;
+import kamon.instrumentation.armeria.converters.KamonArmeriaMessageConverter;
+import kamon.instrumentation.http.HttpServerInstrumentation;
+
+import java.util.Map;
+
+public class ArmeriaHttpServerDecorator extends SimpleDecoratingHttpService {
+  public static final AttributeKey<HttpServerInstrumentation.RequestHandler> REQUEST_HANDLER_TRACE_KEY =
+          AttributeKey.valueOf(HttpServerInstrumentation.RequestHandler.class, "REQUEST_HANDLER_TRACE");
+
+  private final Map<Integer, HttpServerInstrumentation> serverInstrumentationMap;
+
+  public ArmeriaHttpServerDecorator(HttpService delegate, Map<Integer, HttpServerInstrumentation> serverInstrumentations) {
+    super(delegate);
+    this.serverInstrumentationMap = serverInstrumentations;
+  }
+
+  @Override
+  public HttpResponse serve(ServiceRequestContext ctx, HttpRequest req) throws Exception {
+    final HttpServerInstrumentation httpServerInstrumentation = serverInstrumentationMap.get(req.uri().getPort());
+
+    if (httpServerInstrumentation != null) {
+
+      final HttpServerInstrumentation.RequestHandler requestHandler =
+              httpServerInstrumentation.createHandler(KamonArmeriaMessageConverter.toRequest(req));
+
+      ctx.log()
+              .whenComplete()
+              .thenAccept(log -> {
+                final Context context = ctx.attr(REQUEST_HANDLER_TRACE_KEY).context();
+                /**
+                 * This is true only when no configured Route was matched.
+                 * Cases where the route is fallback should be managed here {@link kamon.instrumentation.armeria.server.HandleNotFoundMethodAdvisor#around}
+                 */
+                if (!ctx.config().route().isFallback()) {
+                  requestHandler.span().name(ctx.config().route().patternString());
+                }
+
+                requestHandler.buildResponse(KamonArmeriaMessageConverter.toResponse(log), context);
+                requestHandler.responseSent();
+              });
+
+      try (Storage.Scope ignored = Kamon.storeContext(requestHandler.context())) {
+        ctx.setAttr(REQUEST_HANDLER_TRACE_KEY, requestHandler);
+        return unwrap().serve(ctx, req);
+      }
+    } else {
+      return unwrap().serve(ctx, req);
+    }
+
+  }
+
+}
+
+