open-telemetry
/
opentelemetry-java-instrumentation
mirror of https://github.com/open-telemetry/opentelemetry-java-instrumentation.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Do we do want to ignore proxies? 

If so, we have to change the test to be compatible.
This commit is contained in:
Tyler Benson 2018-05-03 13:57:33 +10:00
parent be34eaf032
commit 2561e72824
3 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/AgentInstaller.java
View File

@ -48,7 +48,7 @@ public class AgentInstaller {
.or(nameStartsWith("datadog.opentracing.")) .or(nameStartsWith("datadog.opentracing."))
.or(nameStartsWith("datadog.slf4j.")) .or(nameStartsWith("datadog.slf4j."))
.or(nameStartsWith("java.").and(not(nameStartsWith("java.util.concurrent.")))) .or(nameStartsWith("java.").and(not(nameStartsWith("java.util.concurrent."))))
.or(nameStartsWith("com.sun.").and(not(nameStartsWith("com.sun.proxy.")))) .or(nameStartsWith("com.sun."))
.or(nameStartsWith("sun.")) .or(nameStartsWith("sun."))
.or(nameStartsWith("jdk.")) .or(nameStartsWith("jdk."))
.or(nameStartsWith("org.aspectj.")) .or(nameStartsWith("org.aspectj."))

11
dd-java-agent/instrumentation/jms-1/src/test/groovy/JMS1Test.groovy
View File

@ -8,6 +8,8 @@ import spock.lang.Shared
import spock.lang.Unroll import spock.lang.Unroll
import javax.jms.Connection import javax.jms.Connection
import javax.jms.Message
import javax.jms.MessageListener
import javax.jms.Session import javax.jms.Session
import javax.jms.TextMessage import javax.jms.TextMessage
import java.util.concurrent.CountDownLatch import java.util.concurrent.CountDownLatch
@ -152,9 +154,12 @@ class JMS1Test extends AgentTestRunner {
def messageRef = new AtomicReference<TextMessage>() def messageRef = new AtomicReference<TextMessage>()
def producer = session.createProducer(destination) def producer = session.createProducer(destination)
def consumer = session.createConsumer(destination) def consumer = session.createConsumer(destination)
consumer.setMessageListener { message -> consumer.setMessageListener new MessageListener() {
lock.await() // ensure the producer trace is reported first. @Override
messageRef.set(message) void onMessage(Message message) {
lock.await() // ensure the producer trace is reported first.
messageRef.set(message)
}
} }
def message = session.createTextMessage("a message") def message = session.createTextMessage("a message")

11
dd-java-agent/instrumentation/jms-2/src/test/groovy/JMS2Test.groovy
View File

@ -17,6 +17,8 @@ import org.hornetq.jms.client.HornetQMessageProducer
import spock.lang.Shared import spock.lang.Shared
import spock.lang.Unroll import spock.lang.Unroll
import javax.jms.Message
import javax.jms.MessageListener
import javax.jms.Session import javax.jms.Session
import javax.jms.TextMessage import javax.jms.TextMessage
import java.util.concurrent.CountDownLatch import java.util.concurrent.CountDownLatch
@ -143,9 +145,12 @@ class JMS2Test extends AgentTestRunner {
def messageRef = new AtomicReference<TextMessage>() def messageRef = new AtomicReference<TextMessage>()
def producer = session.createProducer(destination) def producer = session.createProducer(destination)
def consumer = session.createConsumer(destination) def consumer = session.createConsumer(destination)
consumer.setMessageListener { message -> consumer.setMessageListener new MessageListener() {
lock.await() // ensure the producer trace is reported first. @Override
messageRef.set(message) void onMessage(Message message) {
lock.await() // ensure the producer trace is reported first.
messageRef.set(message)
}
} }
def message = session.createTextMessage("a message") def message = session.createTextMessage("a message")