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

Add property to gradle.properties for easier debugging 

When using a jar with packages renamed, the line numbers don’t match the classes in the IDE.
This commit is contained in:
Tyler Benson 2017-08-22 17:23:28 -07:00
parent 82faf2dcb5
commit 34f0922740
2 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dd-java-agent-ittests/dd-java-agent-ittests.gradle
View File

@ -43,6 +43,10 @@ test {
jvmArgs "-Ddd.trace.configurationFile=${project.buildDir}/resources/test/dd-trace.yaml" jvmArgs "-Ddd.trace.configurationFile=${project.buildDir}/resources/test/dd-trace.yaml"
jvmArgs "-javaagent:${project(':dd-java-agent').buildDir}/libs/dd-java-agent-${project.version}.jar" jvmArgs "-javaagent:${project(':dd-java-agent').buildDir}/libs/dd-java-agent-${project.version}.jar"
jvmArgs "-Dorg.jboss.byteman.verbose=true" jvmArgs "-Dorg.jboss.byteman.verbose=true"
if (project.hasProperty("disableShadowRelocate") && disableShadowRelocate) {
exclude 'com/datadoghq/trace/agent/ShadowPackageRenamingTest.class'
}
} }
test.dependsOn project(':dd-java-agent').shadowJar test.dependsOn project(':dd-java-agent').shadowJar

2
dd-java-agent/dd-java-agent.gradle
View File

@ -91,6 +91,7 @@ shadowJar {
// mergeServiceFiles() // mergeServiceFiles()
if (!project.hasProperty("disableShadowRelocate") || !disableShadowRelocate) {
// Don't relocate slf4j or opentracing deps. // Don't relocate slf4j or opentracing deps.
relocate 'com.fasterxml', 'dd.deps.com.fasterxml' relocate 'com.fasterxml', 'dd.deps.com.fasterxml'
relocate 'javassist', 'dd.deps.javassist' relocate 'javassist', 'dd.deps.javassist'
@ -106,6 +107,7 @@ shadowJar {
// This is used in the Cassandra Cluster.connectAsync signature so we can't relocate it. :fingers_crossed: // This is used in the Cassandra Cluster.connectAsync signature so we can't relocate it. :fingers_crossed:
exclude 'com.google.common.util.concurrent.ListenableFuture' exclude 'com.google.common.util.concurrent.ListenableFuture'
} }
}
//Exclude Java 9 compiled classes: //Exclude Java 9 compiled classes:
exclude 'org/jboss/byteman/agent/JigsawAccessEnablerGenerator.class' exclude 'org/jboss/byteman/agent/JigsawAccessEnablerGenerator.class'