From 91f8e8c1994e518c63ee1dc551a9633d29a8b8f4 Mon Sep 17 00:00:00 2001
From: Anuraag Agrawal <aanuraag@amazon.co.jp>
Date: Mon, 27 Jul 2020 21:01:55 +0900
Subject: [PATCH] Use archivesBaseName when publishing. (#809)

* Use archivesBaseName when publishing.

* Fix auto name
---
 gradle/instrumentation.gradle | 7 +++++--
 gradle/publish.gradle         | 9 +++++++--
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/gradle/instrumentation.gradle b/gradle/instrumentation.gradle
index 9541b43833..bbbc1b940c 100644
--- a/gradle/instrumentation.gradle
+++ b/gradle/instrumentation.gradle
@@ -15,6 +15,11 @@ byteBuddy {
   }
 }
 
+// TODO(anuraaga): This needs to be added before adding publish.gradle, clean up this ordering restraint.
+afterEvaluate {
+  archivesBaseName = 'opentelemetry-auto-' + archivesBaseName
+}
+
 apply from: "$rootDir/gradle/java.gradle"
 if (project.ext.find("skipPublish") != true) {
   apply from: "$rootDir/gradle/publish.gradle"
@@ -22,8 +27,6 @@ if (project.ext.find("skipPublish") != true) {
 
 
 afterEvaluate {
-  archivesBaseName = 'opentelemetry-auto-' + archivesBaseName
-
   byteBuddy {
     transformation {
       tasks = ['compileJava', 'compileScala', 'compileKotlin']
diff --git a/gradle/publish.gradle b/gradle/publish.gradle
index 2b6c3e88ea..473899b51c 100644
--- a/gradle/publish.gradle
+++ b/gradle/publish.gradle
@@ -19,7 +19,9 @@ publishing {
         from components.java
       }
 
-      artifactId = artifactPrefix(project) + artifactId
+      afterEvaluate {
+        artifactId = artifactPrefix(project, archivesBaseName) + archivesBaseName
+      }
 
       pom {
         name = 'OpenTelemetry Instrumentation for Java'
@@ -57,7 +59,10 @@ publishing {
   }
 }
 
-private String artifactPrefix(Project p) {
+private String artifactPrefix(Project p, String archivesBaseName) {
+  if (archivesBaseName.startsWith("opentelemetry")) {
+    return ''
+  }
   if (p.name.startsWith("opentelemetry")) {
     return ''
   }