From 1299141ff68ed3157dd45d8345013076d651bfc7 Mon Sep 17 00:00:00 2001 From: Nikolay Martynov Date: Tue, 2 Oct 2018 10:20:25 -0400 Subject: [PATCH] Enable akka instrumentation by default --- .../akkahttp/AkkaHttpClientInstrumentation.java | 5 ----- .../akkahttp/AkkaHttpServerInstrumentation.java | 5 ----- .../src/test/groovy/AkkaHttpClientInstrumentationTest.groovy | 3 --- .../src/test/groovy/AkkaHttpServerInstrumentationTest.groovy | 3 --- 4 files changed, 16 deletions(-) diff --git a/dd-java-agent/instrumentation/akka-http-10.0/src/main/scala/datadog/trace/instrumentation/akkahttp/AkkaHttpClientInstrumentation.java b/dd-java-agent/instrumentation/akka-http-10.0/src/main/scala/datadog/trace/instrumentation/akkahttp/AkkaHttpClientInstrumentation.java index 7c683c8525..afce387504 100644 --- a/dd-java-agent/instrumentation/akka-http-10.0/src/main/scala/datadog/trace/instrumentation/akkahttp/AkkaHttpClientInstrumentation.java +++ b/dd-java-agent/instrumentation/akka-http-10.0/src/main/scala/datadog/trace/instrumentation/akkahttp/AkkaHttpClientInstrumentation.java @@ -42,11 +42,6 @@ public final class AkkaHttpClientInstrumentation extends Instrumenter.Default { super("akka-http", "akka-http-client"); } - @Override - protected boolean defaultEnabled() { - return false; - } - @Override public ElementMatcher typeMatcher() { return named("akka.http.scaladsl.HttpExt"); diff --git a/dd-java-agent/instrumentation/akka-http-10.0/src/main/scala/datadog/trace/instrumentation/akkahttp/AkkaHttpServerInstrumentation.java b/dd-java-agent/instrumentation/akka-http-10.0/src/main/scala/datadog/trace/instrumentation/akkahttp/AkkaHttpServerInstrumentation.java index a36f7db95c..19aa3eef0a 100644 --- a/dd-java-agent/instrumentation/akka-http-10.0/src/main/scala/datadog/trace/instrumentation/akkahttp/AkkaHttpServerInstrumentation.java +++ b/dd-java-agent/instrumentation/akka-http-10.0/src/main/scala/datadog/trace/instrumentation/akkahttp/AkkaHttpServerInstrumentation.java @@ -40,11 +40,6 @@ public final class AkkaHttpServerInstrumentation extends Instrumenter.Default { super("akka-http", "akka-http-server"); } - @Override - protected boolean defaultEnabled() { - return false; - } - @Override public ElementMatcher typeMatcher() { return named("akka.http.scaladsl.HttpExt"); diff --git a/dd-java-agent/instrumentation/akka-http-10.0/src/test/groovy/AkkaHttpClientInstrumentationTest.groovy b/dd-java-agent/instrumentation/akka-http-10.0/src/test/groovy/AkkaHttpClientInstrumentationTest.groovy index 0f33e7fb6a..6b4eb0b826 100644 --- a/dd-java-agent/instrumentation/akka-http-10.0/src/test/groovy/AkkaHttpClientInstrumentationTest.groovy +++ b/dd-java-agent/instrumentation/akka-http-10.0/src/test/groovy/AkkaHttpClientInstrumentationTest.groovy @@ -22,9 +22,6 @@ import static datadog.trace.agent.test.asserts.ListWriterAssert.assertTraces import static datadog.trace.agent.test.server.http.TestHttpServer.httpServer class AkkaHttpClientInstrumentationTest extends AgentTestRunner { - static { - System.setProperty("dd.integration.akka-http-client.enabled", "true") - } private static final String MESSAGE = "an\nmultiline\nhttp\nresponse" private static final long TIMEOUT = 10000L diff --git a/dd-java-agent/instrumentation/akka-http-10.0/src/test/groovy/AkkaHttpServerInstrumentationTest.groovy b/dd-java-agent/instrumentation/akka-http-10.0/src/test/groovy/AkkaHttpServerInstrumentationTest.groovy index 5326c463f1..feb204ae3e 100644 --- a/dd-java-agent/instrumentation/akka-http-10.0/src/test/groovy/AkkaHttpServerInstrumentationTest.groovy +++ b/dd-java-agent/instrumentation/akka-http-10.0/src/test/groovy/AkkaHttpServerInstrumentationTest.groovy @@ -9,9 +9,6 @@ import spock.lang.Shared import static datadog.trace.agent.test.asserts.ListWriterAssert.assertTraces class AkkaHttpServerInstrumentationTest extends AgentTestRunner { - static { - System.setProperty("dd.integration.akka-http-server.enabled", "true") - } @Shared int asyncPort