From 34f0922740a22757d3dc6f069f666a01401c178b Mon Sep 17 00:00:00 2001
From: Tyler Benson <tyler@newrelic.com>
Date: Tue, 22 Aug 2017 17:23:28 -0700
Subject: [PATCH] Add property to gradle.properties for easier debugging
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

When using a jar with packages renamed, the line numbers don’t match the classes in the IDE.
---
 .../dd-java-agent-ittests.gradle              |  4 +++
 dd-java-agent/dd-java-agent.gradle            | 28 ++++++++++---------
 2 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/dd-java-agent-ittests/dd-java-agent-ittests.gradle b/dd-java-agent-ittests/dd-java-agent-ittests.gradle
index c4777692ad..5070052aed 100644
--- a/dd-java-agent-ittests/dd-java-agent-ittests.gradle
+++ b/dd-java-agent-ittests/dd-java-agent-ittests.gradle
@@ -43,6 +43,10 @@ test {
   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 "-Dorg.jboss.byteman.verbose=true"
+
+  if (project.hasProperty("disableShadowRelocate") && disableShadowRelocate) {
+    exclude 'com/datadoghq/trace/agent/ShadowPackageRenamingTest.class'
+  }
 }
 
 test.dependsOn project(':dd-java-agent').shadowJar
diff --git a/dd-java-agent/dd-java-agent.gradle b/dd-java-agent/dd-java-agent.gradle
index d4ba3450ab..2244fd1b58 100644
--- a/dd-java-agent/dd-java-agent.gradle
+++ b/dd-java-agent/dd-java-agent.gradle
@@ -91,20 +91,22 @@ shadowJar {
 
 //    mergeServiceFiles()
 
-  // Don't relocate slf4j or opentracing deps.
-  relocate 'com.fasterxml', 'dd.deps.com.fasterxml'
-  relocate 'javassist', 'dd.deps.javassist'
-  relocate 'org.reflections', 'dd.deps.org.reflections'
-  relocate 'org.yaml', 'dd.deps.org.yaml'
+  if (!project.hasProperty("disableShadowRelocate") || !disableShadowRelocate) {
+    // Don't relocate slf4j or opentracing deps.
+    relocate 'com.fasterxml', 'dd.deps.com.fasterxml'
+    relocate 'javassist', 'dd.deps.javassist'
+    relocate 'org.reflections', 'dd.deps.org.reflections'
+    relocate 'org.yaml', 'dd.deps.org.yaml'
 
-  relocate('org.jboss.byteman', 'dd.deps.org.jboss.byteman') {
-    // Renaming these causes a verify error in the tests.
-    exclude 'org.jboss.byteman.rule.*'
-    exclude 'org.jboss.byteman.rule.helper.*'
-  }
-  relocate('com.google', 'dd.deps.com.google') {
-    // This is used in the Cassandra Cluster.connectAsync signature so we can't relocate it. :fingers_crossed:
-    exclude 'com.google.common.util.concurrent.ListenableFuture'
+    relocate('org.jboss.byteman', 'dd.deps.org.jboss.byteman') {
+      // Renaming these causes a verify error in the tests.
+      exclude 'org.jboss.byteman.rule.*'
+      exclude 'org.jboss.byteman.rule.helper.*'
+    }
+    relocate('com.google', 'dd.deps.com.google') {
+      // 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 Java 9 compiled classes: