From 1ef242de52c71a24429459f8b951751492307ba2 Mon Sep 17 00:00:00 2001
From: Nikita Salnikov-Tarnovski <gnikem@gmail.com>
Date: Tue, 14 Jul 2020 14:36:43 +0300
Subject: [PATCH] Allows actually consume published instrumentation artifacts

---
 agent-bootstrap/agent-bootstrap.gradle | 1 +
 agent-tooling/agent-tooling.gradle     | 1 +
 gradle/publish.gradle                  | 9 ++++++---
 utils/thread-utils/thread-utils.gradle | 1 +
 4 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/agent-bootstrap/agent-bootstrap.gradle b/agent-bootstrap/agent-bootstrap.gradle
index bbb3cff5c9b2..f4c73e58a903 100644
--- a/agent-bootstrap/agent-bootstrap.gradle
+++ b/agent-bootstrap/agent-bootstrap.gradle
@@ -1,4 +1,5 @@
 apply from: "$rootDir/gradle/java.gradle"
+apply from: "$rootDir/gradle/publish.gradle"
 
 // FIXME: Improve test coverage.
 minimumBranchCoverage = 0.0
diff --git a/agent-tooling/agent-tooling.gradle b/agent-tooling/agent-tooling.gradle
index 0ebad86fa516..af180f1c91d2 100644
--- a/agent-tooling/agent-tooling.gradle
+++ b/agent-tooling/agent-tooling.gradle
@@ -1,4 +1,5 @@
 apply from: "$rootDir/gradle/java.gradle"
+apply from: "$rootDir/gradle/publish.gradle"
 
 // TODO this is not the desired state, only reflects current reality
 minimumBranchCoverage = 0
diff --git a/gradle/publish.gradle b/gradle/publish.gradle
index 41a15b84246f..2b6c3e88eadc 100644
--- a/gradle/publish.gradle
+++ b/gradle/publish.gradle
@@ -57,11 +57,14 @@ publishing {
   }
 }
 
-private String artifactPrefix(Project p){
-  if(p.name.startsWith("opentelemetry")){
+private String artifactPrefix(Project p) {
+  if (p.name.startsWith("opentelemetry")) {
     return ''
   }
-  if(p.group == 'io.opentelemetry.instrumentation.auto'){
+  if (p.name.startsWith("auto")) {
+    return 'opentelemetry-'
+  }
+  if (p.group == 'io.opentelemetry.instrumentation.auto') {
     return 'opentelemetry-auto-'
   }
   return 'opentelemetry-'
diff --git a/utils/thread-utils/thread-utils.gradle b/utils/thread-utils/thread-utils.gradle
index f3e60a1ac6f7..10816024c9a2 100644
--- a/utils/thread-utils/thread-utils.gradle
+++ b/utils/thread-utils/thread-utils.gradle
@@ -1,4 +1,5 @@
 apply from: "$rootDir/gradle/java.gradle"
+apply from: "$rootDir/gradle/publish.gradle"
 
 // TODO: add more tests
 excludedClassesCoverage += [