Enable instrumentation by default and rev version.
MODIFY
dd-java-agent-ittests/dd-java-agent-ittests.gradle
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"

MODIFY
dd-java-agent/instrumentation/jax-rs-annotations/src/main/java/datadog/trace/instrumentation/jaxrs/JaxRsAnnotationsInstrumentation.java
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

RENAME
dd-java-agent/instrumentation/jax-rs-annotations/src/test/groovy/JaxRsInstrumentationTest.groovy
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"() {

MODIFY
dd-java-agent/instrumentation/jax-rs-annotations/src/test/groovy/JerseyTest.groovy
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()

MODIFY
dd-java-agent/instrumentation/jedis-1.4/src/main/java/datadog/trace/instrumentation/jedis/JedisInstrumentation.java
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

MODIFY
dd-java-agent/instrumentation/jedis-1.4/src/test/groovy/JedisClientTest.groovy
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

MODIFY
dd-java-agent/instrumentation/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/KafkaConsumerInstrumentation.java
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

MODIFY
dd-java-agent/instrumentation/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/KafkaProducerInstrumentation.java
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

MODIFY
dd-java-agent/instrumentation/kafka-clients-0.11/src/test/groovy/KafkaClientTest.groovy
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)

MODIFY
dd-java-agent/instrumentation/kafka-streams-0.11/src/main/java/datadog/trace/instrumentation/kafka_streams/KafkaStreamsProcessorInstrumentation.java
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

MODIFY
dd-java-agent/instrumentation/kafka-streams-0.11/src/main/java/datadog/trace/instrumentation/kafka_streams/KafkaStreamsSourceNodeRecordDeserializerInstrumentation.java
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

MODIFY
dd-java-agent/instrumentation/kafka-streams-0.11/src/test/groovy/KafkaStreamsTest.groovy
dd-java-agent/instrumentation/kafka-streams-0.11/src/test/groovy/KafkaStreamsTest.groovy
-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)

MODIFY
dd-trace-java.gradle
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"
}

Enable instrumentation by default and rev version.