Skip to content

Enable instrumentation by default and rev version. #274

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 30, 2018
Merged

Enable instrumentation by default and rev version. #274

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion dd-java-agent-ittests/dd-java-agent-ittests.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
5 changes: 0 additions & 5 deletions ...ns/src/main/java/datadog/trace/instrumentation/jaxrs/JaxRsAnnotationsInstrumentation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,6 @@ public JaxRsAnnotationsInstrumentation() {
super("jax-rs", "jaxrs", "jax-rs-annotations");
}

@Override
protected boolean defaultEnabled() {
return false;
}

@Override
protected AgentBuilder apply(final AgentBuilder agentBuilder) {
return agentBuilder
Expand Down
6 changes: 1 addition & 5 deletions ...st/groovy/JaxRsInstrumentationTest.groovy → ...axRsAnnotationsInstrumentationTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"() {
Expand Down
4 changes: 0 additions & 4 deletions dd-java-agent/instrumentation/jax-rs-annotations/src/test/groovy/JerseyTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
5 changes: 0 additions & 5 deletions ...ion/jedis-1.4/src/main/java/datadog/trace/instrumentation/jedis/JedisInstrumentation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,6 @@ public JedisInstrumentation() {
super(SERVICE_NAME);
}

@Override
protected boolean defaultEnabled() {
return false;
}

@Override
public AgentBuilder apply(final AgentBuilder agentBuilder) {
return agentBuilder
Expand Down
4 changes: 0 additions & 4 deletions dd-java-agent/instrumentation/jedis-1.4/src/test/groovy/JedisClientTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 0 additions & 5 deletions ...c/main/java/datadog/trace/instrumentation/kafka_clients/KafkaConsumerInstrumentation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,11 +43,6 @@ public KafkaConsumerInstrumentation() {
super("kafka");
}

@Override
protected boolean defaultEnabled() {
return false;
}

@Override
public AgentBuilder apply(final AgentBuilder agentBuilder) {
return agentBuilder
Expand Down
5 changes: 0 additions & 5 deletions ...c/main/java/datadog/trace/instrumentation/kafka_clients/KafkaProducerInstrumentation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,11 +40,6 @@ public KafkaProducerInstrumentation() {
super("kafka");
}

@Override
protected boolean defaultEnabled() {
return false;
}

@Override
public AgentBuilder apply(final AgentBuilder agentBuilder) {
return agentBuilder
Expand Down
4 changes: 0 additions & 4 deletions dd-java-agent/instrumentation/kafka-clients-0.11/src/test/groovy/KafkaClientTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
10 changes: 0 additions & 10 deletions ...ava/datadog/trace/instrumentation/kafka_streams/KafkaStreamsProcessorInstrumentation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,11 +44,6 @@ public StartInstrumentation() {
super("kafka", "kafka-streams");
}

@Override
protected boolean defaultEnabled() {
return false;
}

@Override
public AgentBuilder apply(final AgentBuilder agentBuilder) {
return agentBuilder
Expand Down Expand Up @@ -106,11 +101,6 @@ public StopInstrumentation() {
super("kafka", "kafka-streams");
}

@Override
protected boolean defaultEnabled() {
return false;
}

@Override
public AgentBuilder apply(final AgentBuilder agentBuilder) {
return agentBuilder
Expand Down
5 changes: 0 additions & 5 deletions ...nstrumentation/kafka_streams/KafkaStreamsSourceNodeRecordDeserializerInstrumentation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,6 @@ public StartInstrumentation() {
super("kafka", "kafka-streams");
}

@Override
protected boolean defaultEnabled() {
return false;
}

@Override
public AgentBuilder apply(final AgentBuilder agentBuilder) {
return agentBuilder
Expand Down
9 changes: 0 additions & 9 deletions dd-java-agent/instrumentation/kafka-streams-0.11/src/test/groovy/KafkaStreamsTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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
Expand All @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion dd-trace-java.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
Expand Down