From b4b99d991c09908007d50a3cfe01f394de1a334f Mon Sep 17 00:00:00 2001 From: Nikolay Martynov Date: Tue, 17 Jul 2018 13:13:33 -0400 Subject: [PATCH] Move AkkaHttpServerInstrumentation into Scala compilation This is a hack to work around the problem of `auto-service` annotation processing creating files with same name in `java` and `scala` directories. This results in Jar having two files with the same name instead of one concatenated file. --- .../instrumentation/akkahttp/AkkaHttpServerInstrumentation.java | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename dd-java-agent/instrumentation/akka-http-10.0/src/main/{java => scala}/datadog/trace/instrumentation/akkahttp/AkkaHttpServerInstrumentation.java (100%) diff --git a/dd-java-agent/instrumentation/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/AkkaHttpServerInstrumentation.java b/dd-java-agent/instrumentation/akka-http-10.0/src/main/scala/datadog/trace/instrumentation/akkahttp/AkkaHttpServerInstrumentation.java similarity index 100% rename from dd-java-agent/instrumentation/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/AkkaHttpServerInstrumentation.java rename to dd-java-agent/instrumentation/akka-http-10.0/src/main/scala/datadog/trace/instrumentation/akkahttp/AkkaHttpServerInstrumentation.java