From 49194ff4441c5bb68ca5462072dcff3a0193969f Mon Sep 17 00:00:00 2001
From: Anuraag Agrawal <aanuraag@amazon.co.jp>
Date: Mon, 1 Feb 2021 14:33:27 +0900
Subject: [PATCH] =?UTF-8?q?Don't=20hardcode=20agent-for-testing=20archive?=
 =?UTF-8?q?=20filename=20so=20it=20can=20be=20publis=E2=80=A6=20(#2146)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Don't hardcode agent-for-testing archive filename so it can be published.

* Fix accidental

* afterEvaluate
---
 gradle/instrumentation.gradle                     |  4 +++-
 instrumentation/instrumentation.gradle            |  1 -
 .../agent-for-testing/agent-for-testing.gradle    | 15 ++++++++++-----
 3 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/gradle/instrumentation.gradle b/gradle/instrumentation.gradle
index b049f841e2..76ad6e02a4 100644
--- a/gradle/instrumentation.gradle
+++ b/gradle/instrumentation.gradle
@@ -104,9 +104,11 @@ shadowJar {
   relocate "application.io.opentelemetry", "io.opentelemetry"
 }
 
+evaluationDependsOn(":testing:agent-for-testing")
+
 tasks.withType(Test).configureEach {
   jvmArgs "-Dotel.javaagent.debug=true"
-  jvmArgs "-javaagent:${project(":testing:agent-for-testing").buildDir}/libs/javaagent-for-testing.jar"
+  jvmArgs "-javaagent:${project(":testing:agent-for-testing").tasks.shadowJar.archiveFile.get().asFile.absolutePath}"
   jvmArgs "-Dotel.initializer.jar=${shadowJar.archiveFile.get().asFile.absolutePath}"
   jvmArgs "-Dinternal.testing.disable.global.library.ignores=true"
 
diff --git a/instrumentation/instrumentation.gradle b/instrumentation/instrumentation.gradle
index b03842f26e..863f8eec49 100644
--- a/instrumentation/instrumentation.gradle
+++ b/instrumentation/instrumentation.gradle
@@ -46,7 +46,6 @@ configurations {
 }
 
 shadowJar {
-
   mergeServiceFiles()
 
   exclude '**/module-info.class'
diff --git a/testing/agent-for-testing/agent-for-testing.gradle b/testing/agent-for-testing/agent-for-testing.gradle
index 0039d1d65d..0459c1cb97 100644
--- a/testing/agent-for-testing/agent-for-testing.gradle
+++ b/testing/agent-for-testing/agent-for-testing.gradle
@@ -36,9 +36,12 @@ configurations {
   shadowInclude
 }
 
+evaluationDependsOn(":testing:agent-exporter")
+
 shadowJar {
   configurations = [project.configurations.shadowInclude]
-  archiveFileName = 'javaagent-for-testing.jar'
+
+  archiveClassifier.set("")
 
   dependsOn ':testing:agent-exporter:shadowJar'
   with isolateSpec([project(':testing:agent-exporter').tasks.shadowJar])
@@ -77,9 +80,11 @@ dependencies {
   testImplementation deps.opentelemetryApi
 }
 
-tasks.withType(Test).configureEach {
-  jvmArgs "-Dotel.javaagent.debug=true"
-  jvmArgs "-javaagent:${shadowJar.archiveFile.get().asFile.absolutePath}"
+afterEvaluate {
+  tasks.withType(Test).configureEach {
+    jvmArgs "-Dotel.javaagent.debug=true"
+    jvmArgs "-javaagent:${shadowJar.archiveFile.get().asFile.absolutePath}"
 
-  dependsOn shadowJar
+    dependsOn shadowJar
+  }
 }