Rename boostrap and tooling modules (#146)

* Rename agent-bootstrap module to auto-bootstrap

* Rename agent-tooling module to auto-tooling

* Further renames

agent-bootstrap/src/main/java/io/opentelemetry/auto/bootstrap/Agent.java

@@ -143,7 +143,7 @@ public class Agent {
       final ClassLoader contextLoader = Thread.currentThread().getContextClassLoader();
       try {
         final ClassLoader agentClassLoader =
-            createAgentClassLoader("agent-tooling-and-instrumentation.isolated", bootstrapURL);
+            createAgentClassLoader("auto-tooling-and-instrumentation.isolated", bootstrapURL);
         Thread.currentThread().setContextClassLoader(agentClassLoader);
         final Class<?> agentInstallerClass =
             agentClassLoader.loadClass("io.opentelemetry.auto.tooling.AgentInstaller");

agent-tooling/agent-tooling.gradle

@@ -13,7 +13,7 @@ configurations {
 }
 
 dependencies {
-  compile(project(':agent-bootstrap')) {
+  compile(project(':auto-bootstrap')) {
     // This only needs to exist in the bootstrap, not the instrumentation jar.
     exclude group: 'org.slf4j', module: 'slf4j-simple'
   }

benchmark-integration/jetty-perftest/jetty-perftest.gradle

@@ -1,5 +1,5 @@
 dependencies {
-  compile project(':agent-bootstrap')
+  compile project(':auto-bootstrap')
   compile project(':benchmark-integration')
 
   compile group: 'org.eclipse.jetty', name: 'jetty-server', version: '9.4.1.v20170120'

benchmark-integration/play-perftest/play-perftest.gradle

@@ -20,7 +20,7 @@ dependencies {
   play "com.typesafe.play:play-logback_$scalaVersion:$playVersion"
   play "com.typesafe.play:filters-helpers_$scalaVersion:$playVersion"
 
-  play project(':agent-bootstrap')
+  play project(':auto-bootstrap')
   play project(':benchmark-integration')
 }
 

buildSrc/src/main/groovy/MuzzlePlugin.groovy

@@ -41,8 +41,8 @@ class MuzzlePlugin implements Plugin<Project> {
 
   @Override
   void apply(Project project) {
-    def bootstrapProject = project.rootProject.getChildProjects().get('agent-bootstrap')
-    def toolingProject = project.rootProject.getChildProjects().get('agent-tooling')
+    def bootstrapProject = project.rootProject.getChildProjects().get('auto-bootstrap')
+    def toolingProject = project.rootProject.getChildProjects().get('auto-tooling')
     project.extensions.create("muzzle", MuzzleExtension, project.objects)
 
     // compileMuzzle compiles all projects required to run muzzle validation.
@@ -128,7 +128,7 @@ class MuzzlePlugin implements Plugin<Project> {
       final ClassLoader toolingLoader = TOOLING_LOADER.get()
       if (toolingLoader == null) {
         Set<URL> ddUrls = new HashSet<>()
-        toolingProject.getLogger().info('creating classpath for agent-tooling')
+        toolingProject.getLogger().info('creating classpath for auto-tooling')
         for (File f : toolingProject.sourceSets.main.runtimeClasspath.getFiles()) {
           toolingProject.getLogger().info('--' + f)
           ddUrls.add(f.toURI().toURL())

instrumentation/akka-http-10.0/akka-http-10.0.gradle

@@ -72,7 +72,7 @@ muzzle {
 dependencies {
   main_java8CompileOnly group: 'com.typesafe.akka', name: 'akka-http_2.11', version: '10.0.0'
 
-  compile project(':agent-tooling')
+  compile project(':auto-tooling')
   compile deps.autoservice
   annotationProcessor deps.autoservice
 

instrumentation/elasticsearch/elasticsearch.gradle

@@ -3,5 +3,5 @@ apply from: "${rootDir}/gradle/java.gradle"
 dependencies {
   compileOnly group: 'org.elasticsearch.client', name: 'rest', version: '5.0.0'
   compileOnly group: 'org.elasticsearch', name: 'elasticsearch', version: '2.0.0'
-  compile project(':agent-tooling')
+  compile project(':auto-tooling')
 }

instrumentation/instrumentation.gradle

@@ -33,7 +33,7 @@ subprojects { Project subProj ->
       transformation {
         tasks = ['compileJava', 'compileScala', 'compileKotlin']
         plugin = 'io.opentelemetry.auto.tooling.muzzle.MuzzleGradlePlugin'
-        classPath = project(':agent-tooling').configurations.instrumentationMuzzle + subProj.configurations.compile + subProj.sourceSets.main.output
+        classPath = project(':auto-tooling').configurations.instrumentationMuzzle + subProj.configurations.compile + subProj.sourceSets.main.output
       }
     }
 
@@ -45,14 +45,14 @@ subprojects { Project subProj ->
     }
     dependencies {
       // Apply common dependencies for instrumentation.
-      compile(project(':agent-tooling')) {
+      compile(project(':auto-tooling')) {
         // OpenTelemetry SDK is not needed for compilation, and :opentelemetry-sdk-shaded-for-testing
         // is brought in for tests by project(:testing) below
         exclude group: 'io.opentelemetry', module: 'opentelemetry-sdk'
       }
       compile deps.bytebuddy
       if (jdkCompile) {
-        "$jdkCompile"(project(':agent-tooling')) {
+        "$jdkCompile"(project(':auto-tooling')) {
           // OpenTelemetry SDK is not needed for compilation, and :opentelemetry-sdk-shaded-for-testing
           // is brought in for tests by project(:testing) below
           exclude group: 'io.opentelemetry', module: 'opentelemetry-sdk'
@@ -77,8 +77,8 @@ subprojects { Project subProj ->
 }
 
 dependencies {
-  compile(project(':agent-tooling')) {
-    exclude module: ':agent-bootstrap'
+  compile(project(':auto-tooling')) {
+    exclude module: ':auto-bootstrap'
   }
 
   // TODO: including the jaeger exporter doubles the agent jar file size, would be better for it to be optional component
@@ -110,7 +110,7 @@ shadowJar {
   relocate 'java.util.logging.Logger', 'io.opentelemetry.auto.bootstrap.PatchLogger'
 
   dependencies {
-    exclude(project(':agent-bootstrap'))
+    exclude(project(':auto-bootstrap'))
   }
 
   // relocate OpenTelemetry API usage

instrumentation/okhttp-3.0/okhttp-3.0.gradle

@@ -29,7 +29,7 @@ not transitive.
 dependencies {
   compileOnly(group: 'com.squareup.okhttp3', name: 'okhttp', version: '3.0.0')
 
-  compile(project(':agent-tooling')) {
+  compile(project(':auto-tooling')) {
     exclude module: 'okhttp'
   }
 

java-agent/java-agent.gradle

@@ -13,7 +13,7 @@ configurations {
 
 processResources {
   from(zipTree(project(':instrumentation').tasks.shadowJar.archiveFile)) {
-    into 'agent-tooling-and-instrumentation.isolated'
+    into 'auto-tooling-and-instrumentation.isolated'
     rename '(^.*)\\.class$', '$1.classdata'
     // Rename LICENSE file since it clashes with license dir on non-case sensitive FSs (i.e. Mac)
     rename '^LICENSE$', 'LICENSE.renamed'
@@ -67,7 +67,7 @@ shadowJar {
 }
 
 dependencies {
-  testCompile project(':agent-bootstrap')
+  testCompile project(':auto-bootstrap')
   testCompile project(':utils:gc-utils')
 
   testCompile deps.testLogging
@@ -75,7 +75,7 @@ dependencies {
 
   testCompile 'io.opentracing.contrib.dropwizard:dropwizard-opentracing:0.2.2'
 
-  shadowInclude project(path: ':agent-bootstrap')
+  shadowInclude project(path: ':auto-bootstrap')
 }
 
 tasks.withType(Test).configureEach {

load-generator/load-generator.gradle

@@ -1,7 +1,7 @@
 apply from: "${rootDir}/gradle/java.gradle"
 
 dependencies {
-  compile project(':agent-bootstrap')
+  compile project(':auto-bootstrap')
 
   compile 'info.picocli:picocli:4.0.4'
   compile deps.guava

opentelemetry-sdk-shaded-for-testing/opentelemetry-sdk-shaded-for-testing.gradle

@@ -12,7 +12,7 @@ dependencies {
 // when running various instrumentation tests (e.g. datastax-cassandra)
 // TODO this is not ideal because tests are run using this partially shaded OpenTelemetry SDK, while the agent ends up
 // running with unshaded OpenTelemetry SDK (because its in isolated class loader at that point)
-// build agent-tooling-and-instrumentation.isolated and use that in tests, then wouldn't need to shade guava, etc
+// build auto-tooling-and-instrumentation.isolated and use that in tests, then wouldn't need to shade guava, etc
 shadowJar {
 
   dependencies {

settings.gradle

@@ -141,4 +141,6 @@ def setBuildFile(project) {
 
 setBuildFile(rootProject)
 
+project(':agent-bootstrap').name = 'auto-bootstrap'
+project(':agent-tooling').name = 'auto-tooling'
 project(':java-agent').name = 'opentelemetry-auto'

testing/testing.gradle

@@ -27,7 +27,7 @@ dependencies {
 
   compile group: 'org.eclipse.jetty', name: 'jetty-server', version: '8.0.0.v20110901'
 
-  compile(project(':agent-tooling')) {
+  compile(project(':auto-tooling')) {
     // including :opentelemetry-sdk-shaded-for-testing above instead
     exclude group: 'io.opentelemetry', module: 'opentelemetry-sdk'
   }