diff --git a/dd-java-agent-ittests/dd-java-agent-ittests.gradle b/dd-java-agent-ittests/dd-java-agent-ittests.gradle index dcc11adeb9..348dc91097 100644 --- a/dd-java-agent-ittests/dd-java-agent-ittests.gradle +++ b/dd-java-agent-ittests/dd-java-agent-ittests.gradle @@ -38,7 +38,7 @@ dependencies { } test { - jvmArgs "-Ddd.writer.type=ListWriter", "-Ddd.service.name=java-app" + jvmArgs "-Ddd.writer.type=LogWriter", "-Ddd.service.name=java-app" jvmArgs "-Ddatadog.slf4j.simpleLogger.defaultLogLevel=debug" jvmArgs "-Dorg.slf4j.simpleLogger.defaultLogLevel=debug" diff --git a/dd-java-agent/instrumentation/jax-rs-annotations/src/main/java/datadog/trace/instrumentation/jaxrs/JaxRsAnnotationsInstrumentation.java b/dd-java-agent/instrumentation/jax-rs-annotations/src/main/java/datadog/trace/instrumentation/jaxrs/JaxRsAnnotationsInstrumentation.java index 51f22b0959..3b9f241c2d 100644 --- a/dd-java-agent/instrumentation/jax-rs-annotations/src/main/java/datadog/trace/instrumentation/jaxrs/JaxRsAnnotationsInstrumentation.java +++ b/dd-java-agent/instrumentation/jax-rs-annotations/src/main/java/datadog/trace/instrumentation/jaxrs/JaxRsAnnotationsInstrumentation.java @@ -29,11 +29,6 @@ public final class JaxRsAnnotationsInstrumentation extends Instrumenter.Configur super("jax-rs", "jaxrs", "jax-rs-annotations"); } - @Override - protected boolean defaultEnabled() { - return false; - } - @Override protected AgentBuilder apply(final AgentBuilder agentBuilder) { return agentBuilder diff --git a/dd-java-agent/instrumentation/jax-rs-annotations/src/test/groovy/JaxRsInstrumentationTest.groovy b/dd-java-agent/instrumentation/jax-rs-annotations/src/test/groovy/JaxRsAnnotationsInstrumentationTest.groovy similarity index 94% rename from dd-java-agent/instrumentation/jax-rs-annotations/src/test/groovy/JaxRsInstrumentationTest.groovy rename to dd-java-agent/instrumentation/jax-rs-annotations/src/test/groovy/JaxRsAnnotationsInstrumentationTest.groovy index 2ffd078c97..eb4559ebf9 100644 --- a/dd-java-agent/instrumentation/jax-rs-annotations/src/test/groovy/JaxRsInstrumentationTest.groovy +++ b/dd-java-agent/instrumentation/jax-rs-annotations/src/test/groovy/JaxRsAnnotationsInstrumentationTest.groovy @@ -7,11 +7,7 @@ import spock.lang.Unroll import javax.ws.rs.* @Timeout(1) -class JaxRsInstrumentationTest extends AgentTestRunner { - - static { - System.setProperty("dd.integration.jax-rs.enabled", "true") - } +class JaxRsAnnotationsInstrumentationTest extends AgentTestRunner { @Unroll def "span named '#resourceName' from annotations on class"() { diff --git a/dd-java-agent/instrumentation/jax-rs-annotations/src/test/groovy/JerseyTest.groovy b/dd-java-agent/instrumentation/jax-rs-annotations/src/test/groovy/JerseyTest.groovy index 8cdf7c9828..ee193dc062 100644 --- a/dd-java-agent/instrumentation/jax-rs-annotations/src/test/groovy/JerseyTest.groovy +++ b/dd-java-agent/instrumentation/jax-rs-annotations/src/test/groovy/JerseyTest.groovy @@ -7,10 +7,6 @@ import spock.lang.Timeout @Timeout(5) class JerseyTest extends AgentTestRunner { - static { - System.setProperty("dd.integration.jax-rs.enabled", "true") - } - @Shared @ClassRule ResourceTestRule resources = ResourceTestRule.builder().addResource(new TestResource()).build() diff --git a/dd-java-agent/instrumentation/jedis-1.4/src/main/java/datadog/trace/instrumentation/jedis/JedisInstrumentation.java b/dd-java-agent/instrumentation/jedis-1.4/src/main/java/datadog/trace/instrumentation/jedis/JedisInstrumentation.java index 3fd18c7c85..ebf704479c 100644 --- a/dd-java-agent/instrumentation/jedis-1.4/src/main/java/datadog/trace/instrumentation/jedis/JedisInstrumentation.java +++ b/dd-java-agent/instrumentation/jedis-1.4/src/main/java/datadog/trace/instrumentation/jedis/JedisInstrumentation.java @@ -30,11 +30,6 @@ public final class JedisInstrumentation extends Instrumenter.Configurable { super(SERVICE_NAME); } - @Override - protected boolean defaultEnabled() { - return false; - } - @Override public AgentBuilder apply(final AgentBuilder agentBuilder) { return agentBuilder diff --git a/dd-java-agent/instrumentation/jedis-1.4/src/test/groovy/JedisClientTest.groovy b/dd-java-agent/instrumentation/jedis-1.4/src/test/groovy/JedisClientTest.groovy index e0c30ea80e..cb9c8cba7e 100644 --- a/dd-java-agent/instrumentation/jedis-1.4/src/test/groovy/JedisClientTest.groovy +++ b/dd-java-agent/instrumentation/jedis-1.4/src/test/groovy/JedisClientTest.groovy @@ -13,10 +13,6 @@ class JedisClientTest extends AgentTestRunner { public static final int PORT = 6399 - static { - System.setProperty("dd.integration.redis.enabled", "true") - } - @Shared RedisServer redisServer = RedisServer.builder() // bind to localhost to avoid firewall popup diff --git a/dd-java-agent/instrumentation/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/KafkaConsumerInstrumentation.java b/dd-java-agent/instrumentation/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/KafkaConsumerInstrumentation.java index 272f4cca00..c6a43a941b 100644 --- a/dd-java-agent/instrumentation/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/KafkaConsumerInstrumentation.java +++ b/dd-java-agent/instrumentation/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/KafkaConsumerInstrumentation.java @@ -43,11 +43,6 @@ public final class KafkaConsumerInstrumentation extends Instrumenter.Configurabl super("kafka"); } - @Override - protected boolean defaultEnabled() { - return false; - } - @Override public AgentBuilder apply(final AgentBuilder agentBuilder) { return agentBuilder diff --git a/dd-java-agent/instrumentation/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/KafkaProducerInstrumentation.java b/dd-java-agent/instrumentation/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/KafkaProducerInstrumentation.java index 18cdbe19b4..0315afcb00 100644 --- a/dd-java-agent/instrumentation/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/KafkaProducerInstrumentation.java +++ b/dd-java-agent/instrumentation/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/KafkaProducerInstrumentation.java @@ -40,11 +40,6 @@ public final class KafkaProducerInstrumentation extends Instrumenter.Configurabl super("kafka"); } - @Override - protected boolean defaultEnabled() { - return false; - } - @Override public AgentBuilder apply(final AgentBuilder agentBuilder) { return agentBuilder diff --git a/dd-java-agent/instrumentation/kafka-clients-0.11/src/test/groovy/KafkaClientTest.groovy b/dd-java-agent/instrumentation/kafka-clients-0.11/src/test/groovy/KafkaClientTest.groovy index d3d98d6c6d..4df3878482 100644 --- a/dd-java-agent/instrumentation/kafka-clients-0.11/src/test/groovy/KafkaClientTest.groovy +++ b/dd-java-agent/instrumentation/kafka-clients-0.11/src/test/groovy/KafkaClientTest.groovy @@ -20,10 +20,6 @@ import java.util.concurrent.TimeUnit class KafkaClientTest extends AgentTestRunner { static final SHARED_TOPIC = "shared.topic" - static { - System.setProperty("dd.integration.kafka.enabled", "true") - } - @Shared @ClassRule KafkaEmbedded embeddedKafka = new KafkaEmbedded(1, true, SHARED_TOPIC) diff --git a/dd-java-agent/instrumentation/kafka-streams-0.11/src/main/java/datadog/trace/instrumentation/kafka_streams/KafkaStreamsProcessorInstrumentation.java b/dd-java-agent/instrumentation/kafka-streams-0.11/src/main/java/datadog/trace/instrumentation/kafka_streams/KafkaStreamsProcessorInstrumentation.java index e76224fc67..461100deec 100644 --- a/dd-java-agent/instrumentation/kafka-streams-0.11/src/main/java/datadog/trace/instrumentation/kafka_streams/KafkaStreamsProcessorInstrumentation.java +++ b/dd-java-agent/instrumentation/kafka-streams-0.11/src/main/java/datadog/trace/instrumentation/kafka_streams/KafkaStreamsProcessorInstrumentation.java @@ -44,11 +44,6 @@ public class KafkaStreamsProcessorInstrumentation { super("kafka", "kafka-streams"); } - @Override - protected boolean defaultEnabled() { - return false; - } - @Override public AgentBuilder apply(final AgentBuilder agentBuilder) { return agentBuilder @@ -106,11 +101,6 @@ public class KafkaStreamsProcessorInstrumentation { super("kafka", "kafka-streams"); } - @Override - protected boolean defaultEnabled() { - return false; - } - @Override public AgentBuilder apply(final AgentBuilder agentBuilder) { return agentBuilder diff --git a/dd-java-agent/instrumentation/kafka-streams-0.11/src/main/java/datadog/trace/instrumentation/kafka_streams/KafkaStreamsSourceNodeRecordDeserializerInstrumentation.java b/dd-java-agent/instrumentation/kafka-streams-0.11/src/main/java/datadog/trace/instrumentation/kafka_streams/KafkaStreamsSourceNodeRecordDeserializerInstrumentation.java index 081ebfe4f9..8ed9d375ae 100644 --- a/dd-java-agent/instrumentation/kafka-streams-0.11/src/main/java/datadog/trace/instrumentation/kafka_streams/KafkaStreamsSourceNodeRecordDeserializerInstrumentation.java +++ b/dd-java-agent/instrumentation/kafka-streams-0.11/src/main/java/datadog/trace/instrumentation/kafka_streams/KafkaStreamsSourceNodeRecordDeserializerInstrumentation.java @@ -26,11 +26,6 @@ public class KafkaStreamsSourceNodeRecordDeserializerInstrumentation { super("kafka", "kafka-streams"); } - @Override - protected boolean defaultEnabled() { - return false; - } - @Override public AgentBuilder apply(final AgentBuilder agentBuilder) { return agentBuilder diff --git a/dd-java-agent/instrumentation/kafka-streams-0.11/src/test/groovy/KafkaStreamsTest.groovy b/dd-java-agent/instrumentation/kafka-streams-0.11/src/test/groovy/KafkaStreamsTest.groovy index 90b5f22c39..f9fad017e7 100644 --- a/dd-java-agent/instrumentation/kafka-streams-0.11/src/test/groovy/KafkaStreamsTest.groovy +++ b/dd-java-agent/instrumentation/kafka-streams-0.11/src/test/groovy/KafkaStreamsTest.groovy @@ -1,5 +1,3 @@ -import ch.qos.logback.classic.Level -import ch.qos.logback.classic.Logger import datadog.trace.agent.test.AgentTestRunner import org.apache.kafka.clients.consumer.ConsumerRecord import org.apache.kafka.common.serialization.Serdes @@ -9,7 +7,6 @@ import org.apache.kafka.streams.kstream.KStream import org.apache.kafka.streams.kstream.KStreamBuilder import org.apache.kafka.streams.kstream.ValueMapper import org.junit.ClassRule -import org.slf4j.LoggerFactory import org.springframework.kafka.core.DefaultKafkaConsumerFactory import org.springframework.kafka.core.DefaultKafkaProducerFactory import org.springframework.kafka.core.KafkaTemplate @@ -30,12 +27,6 @@ class KafkaStreamsTest extends AgentTestRunner { static final STREAM_PENDING = "test.pending" static final STREAM_PROCESSED = "test.processed" - static { - ((Logger) LoggerFactory.getLogger(Logger.ROOT_LOGGER_NAME)).setLevel(Level.WARN) - ((Logger) LoggerFactory.getLogger("datadog")).setLevel(Level.DEBUG) - System.setProperty("dd.integration.kafka.enabled", "true") - } - @Shared @ClassRule KafkaEmbedded embeddedKafka = new KafkaEmbedded(1, true, STREAM_PENDING, STREAM_PROCESSED) diff --git a/dd-trace-java.gradle b/dd-trace-java.gradle index 5ed6194951..7ba191ab45 100644 --- a/dd-trace-java.gradle +++ b/dd-trace-java.gradle @@ -15,7 +15,7 @@ plugins { allprojects { group = 'com.datadoghq' - version = '0.5.1-SNAPSHOT' + version = '0.6.0-SNAPSHOT' apply from: "${rootDir}/gradle/dependencies.gradle" }