diff --git a/.circleci/collect_libs.sh b/.circleci/collect_libs.sh index 31247730e1..9395de1329 100755 --- a/.circleci/collect_libs.sh +++ b/.circleci/collect_libs.sh @@ -9,5 +9,5 @@ set -e LIBS_DIR=./libs/ mkdir -p $LIBS_DIR >/dev/null 2>&1 -cp workspace/opentelemetry-javaagent/build/libs/*.jar $LIBS_DIR/ +cp workspace/javaagent/build/libs/*.jar $LIBS_DIR/ cp workspace/auto-exporters/*/build/libs/*.jar $LIBS_DIR/ diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 6ce75b362a..99c958a02b 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -38,7 +38,7 @@ and then generate the -all artifact and then you can find the java agent artifact at -`opentelemetry-javaagent/build/lib/opentelemetry-javaagent--all.jar`. +`javaagent/build/lib/opentelemetry-javaagent--all.jar`. ### IntelliJ setup diff --git a/auto-exporters/auto-exporters.gradle b/auto-exporters/auto-exporters.gradle index 7ba6a1bdce..65f0ef3d3f 100644 --- a/auto-exporters/auto-exporters.gradle +++ b/auto-exporters/auto-exporters.gradle @@ -1,66 +1,66 @@ plugins { - id "com.github.johnrengelman.shadow" + id "com.github.johnrengelman.shadow" } apply from: "$rootDir/gradle/java.gradle" dependencies { - testImplementation project(':auto-tooling') + testImplementation project(':javaagent-tooling') - testImplementation deps.opentelemetrySdkAutoConfig - testImplementation project(':auto-exporters:opentelemetry-auto-exporter-otlp') - testImplementation project(':auto-exporters:opentelemetry-auto-exporter-jaeger') - testImplementation project(':auto-exporters:opentelemetry-auto-exporter-logging') - testImplementation project(':auto-exporters:opentelemetry-auto-exporter-zipkin') + testImplementation deps.opentelemetrySdkAutoConfig + testImplementation project(':auto-exporters:opentelemetry-auto-exporter-otlp') + testImplementation project(':auto-exporters:opentelemetry-auto-exporter-jaeger') + testImplementation project(':auto-exporters:opentelemetry-auto-exporter-logging') + testImplementation project(':auto-exporters:opentelemetry-auto-exporter-zipkin') } tasks.withType(Test).configureEach() { - dependsOn ':auto-exporters:opentelemetry-auto-exporter-otlp:shadowJar' - dependsOn ':auto-exporters:opentelemetry-auto-exporter-jaeger:shadowJar' - dependsOn ':auto-exporters:opentelemetry-auto-exporter-logging:shadowJar' - dependsOn ':auto-exporters:opentelemetry-auto-exporter-zipkin:shadowJar' - doFirst { - systemProperty 'projectVersion', allprojects.version[0] - systemProperty 'adapterRoot', "$rootDir/auto-exporters" - systemProperty 'otlpExporterJar', project(':auto-exporters:opentelemetry-auto-exporter-otlp').tasks.shadowJar.archivePath - systemProperty 'jaegerExporterJar', project(':auto-exporters:opentelemetry-auto-exporter-jaeger').tasks.shadowJar.archivePath - systemProperty 'loggingExporterJar', project(':auto-exporters:opentelemetry-auto-exporter-logging').tasks.shadowJar.archivePath - systemProperty 'zipkinExporterJar', project(':auto-exporters:opentelemetry-auto-exporter-zipkin').tasks.shadowJar.archivePath - } + dependsOn ':auto-exporters:opentelemetry-auto-exporter-otlp:shadowJar' + dependsOn ':auto-exporters:opentelemetry-auto-exporter-jaeger:shadowJar' + dependsOn ':auto-exporters:opentelemetry-auto-exporter-logging:shadowJar' + dependsOn ':auto-exporters:opentelemetry-auto-exporter-zipkin:shadowJar' + doFirst { + systemProperty 'projectVersion', allprojects.version[0] + systemProperty 'adapterRoot', "$rootDir/auto-exporters" + systemProperty 'otlpExporterJar', project(':auto-exporters:opentelemetry-auto-exporter-otlp').tasks.shadowJar.archivePath + systemProperty 'jaegerExporterJar', project(':auto-exporters:opentelemetry-auto-exporter-jaeger').tasks.shadowJar.archivePath + systemProperty 'loggingExporterJar', project(':auto-exporters:opentelemetry-auto-exporter-logging').tasks.shadowJar.archivePath + systemProperty 'zipkinExporterJar', project(':auto-exporters:opentelemetry-auto-exporter-zipkin').tasks.shadowJar.archivePath + } } configurations { - shadowInclude + shadowInclude } dependencies { - shadowInclude project(path: ':auto-exporters:opentelemetry-auto-exporter-logging', configuration: 'shadow') - shadowInclude project(path: ':auto-exporters:opentelemetry-auto-exporter-otlp', configuration: 'shadow') - shadowInclude project(path: ':auto-exporters:opentelemetry-auto-exporter-jaeger', configuration: 'shadow') - shadowInclude project(path: ':auto-exporters:opentelemetry-auto-exporter-zipkin', configuration: 'shadow') + shadowInclude project(path: ':auto-exporters:opentelemetry-auto-exporter-logging', configuration: 'shadow') + shadowInclude project(path: ':auto-exporters:opentelemetry-auto-exporter-otlp', configuration: 'shadow') + shadowInclude project(path: ':auto-exporters:opentelemetry-auto-exporter-jaeger', configuration: 'shadow') + shadowInclude project(path: ':auto-exporters:opentelemetry-auto-exporter-zipkin', configuration: 'shadow') } shadowJar { - configurations = [project.configurations.shadowInclude] + configurations = [project.configurations.shadowInclude] - archiveClassifier = '' + archiveClassifier = '' - mergeServiceFiles() + mergeServiceFiles() - exclude '**/module-info.class' + exclude '**/module-info.class' - // Prevents conflict with other SLF4J instances. Important for premain. - relocate 'org.slf4j', 'io.opentelemetry.auto.slf4j' - // rewrite dependencies calling Logger.getLogger - relocate 'java.util.logging.Logger', 'io.opentelemetry.auto.bootstrap.PatchLogger' + // Prevents conflict with other SLF4J instances. Important for premain. + relocate 'org.slf4j', 'io.opentelemetry.auto.slf4j' + // rewrite dependencies calling Logger.getLogger + relocate 'java.util.logging.Logger', 'io.opentelemetry.auto.bootstrap.PatchLogger' - // relocate OpenTelemetry API usage - relocate "io.opentelemetry.OpenTelemetry", "io.opentelemetry.auto.shaded.io.opentelemetry.OpenTelemetry" - relocate "io.opentelemetry.common", "io.opentelemetry.auto.shaded.io.opentelemetry.common" - relocate "io.opentelemetry.context", "io.opentelemetry.auto.shaded.io.opentelemetry.context" - relocate "io.opentelemetry.correlationcontext", "io.opentelemetry.auto.shaded.io.opentelemetry.correlationcontext" - relocate "io.opentelemetry.internal", "io.opentelemetry.auto.shaded.io.opentelemetry.internal" - relocate "io.opentelemetry.metrics", "io.opentelemetry.auto.shaded.io.opentelemetry.metrics" - relocate "io.opentelemetry.trace", "io.opentelemetry.auto.shaded.io.opentelemetry.trace" + // relocate OpenTelemetry API usage + relocate "io.opentelemetry.OpenTelemetry", "io.opentelemetry.auto.shaded.io.opentelemetry.OpenTelemetry" + relocate "io.opentelemetry.common", "io.opentelemetry.auto.shaded.io.opentelemetry.common" + relocate "io.opentelemetry.context", "io.opentelemetry.auto.shaded.io.opentelemetry.context" + relocate "io.opentelemetry.correlationcontext", "io.opentelemetry.auto.shaded.io.opentelemetry.correlationcontext" + relocate "io.opentelemetry.internal", "io.opentelemetry.auto.shaded.io.opentelemetry.internal" + relocate "io.opentelemetry.metrics", "io.opentelemetry.auto.shaded.io.opentelemetry.metrics" + relocate "io.opentelemetry.trace", "io.opentelemetry.auto.shaded.io.opentelemetry.trace" } diff --git a/benchmark-integration/jetty-perftest/jetty-perftest.gradle b/benchmark-integration/jetty-perftest/jetty-perftest.gradle index 46520f712d..a9ae31f2d6 100644 --- a/benchmark-integration/jetty-perftest/jetty-perftest.gradle +++ b/benchmark-integration/jetty-perftest/jetty-perftest.gradle @@ -1,5 +1,5 @@ dependencies { - implementation project(':auto-bootstrap') + implementation project(':javaagent-bootstrap') implementation project(':benchmark-integration') implementation group: 'org.eclipse.jetty', name: 'jetty-server', version: '9.4.1.v20170120' diff --git a/benchmark-integration/play-perftest/play-perftest.gradle b/benchmark-integration/play-perftest/play-perftest.gradle index 2dfef9a05b..273016a23c 100644 --- a/benchmark-integration/play-perftest/play-perftest.gradle +++ b/benchmark-integration/play-perftest/play-perftest.gradle @@ -22,7 +22,7 @@ dependencies { implementation "com.typesafe.play:play-logback_$scalaVersion:$playVersion" implementation "com.typesafe.play:filters-helpers_$scalaVersion:$playVersion" - implementation project(':auto-bootstrap') + implementation project(':javaagent-bootstrap') implementation project(':benchmark-integration') } diff --git a/benchmark/benchmark.gradle b/benchmark/benchmark.gradle index edeecde6b4..8388286aa1 100644 --- a/benchmark/benchmark.gradle +++ b/benchmark/benchmark.gradle @@ -49,7 +49,7 @@ jmh { jmhVersion = '1.23' // Specifies JMH version } -tasks.jmh.dependsOn(':opentelemetry-javaagent:shadowJar') +tasks.jmh.dependsOn(':javaagent:shadowJar') /* If using libasyncProfiler, use the following to generate nice svg flamegraphs. diff --git a/benchmark/src/jmh/java/io/opentelemetry/benchmark/ClassRetransformingBenchmark.java b/benchmark/src/jmh/java/io/opentelemetry/benchmark/ClassRetransformingBenchmark.java index 0ec69ce68e..3a47c118aa 100644 --- a/benchmark/src/jmh/java/io/opentelemetry/benchmark/ClassRetransformingBenchmark.java +++ b/benchmark/src/jmh/java/io/opentelemetry/benchmark/ClassRetransformingBenchmark.java @@ -47,6 +47,6 @@ public class ClassRetransformingBenchmark { @Fork( jvmArgsAppend = "-javaagent:/path/to/opentelemetry-java-instrumentation" - + "/opentelemetry-javaagent/build/libs/opentelemetry-javaagent.jar") + + "/javaagent/build/libs/opentelemetry-javaagent.jar") public static class WithAgent extends ClassRetransformingBenchmark {} } diff --git a/benchmark/src/jmh/java/io/opentelemetry/benchmark/TypeMatchingBenchmark.java b/benchmark/src/jmh/java/io/opentelemetry/benchmark/TypeMatchingBenchmark.java index 9c802ad87c..3167810058 100644 --- a/benchmark/src/jmh/java/io/opentelemetry/benchmark/TypeMatchingBenchmark.java +++ b/benchmark/src/jmh/java/io/opentelemetry/benchmark/TypeMatchingBenchmark.java @@ -80,6 +80,6 @@ public class TypeMatchingBenchmark { @Fork( jvmArgsAppend = "-javaagent:/path/to/opentelemetry-java-instrumentation" - + "/opentelemetry-javaagent/build/libs/opentelemetry-javaagent.jar") + + "/javaagent/build/libs/opentelemetry-javaagent.jar") public static class WithAgent extends TypeMatchingBenchmark {} } diff --git a/buildSrc/src/main/groovy/MuzzlePlugin.groovy b/buildSrc/src/main/groovy/MuzzlePlugin.groovy index 9cd3ef6dc0..40a372c53d 100644 --- a/buildSrc/src/main/groovy/MuzzlePlugin.groovy +++ b/buildSrc/src/main/groovy/MuzzlePlugin.groovy @@ -55,8 +55,8 @@ class MuzzlePlugin implements Plugin { @Override void apply(Project project) { - def bootstrapProject = project.rootProject.getChildProjects().get('auto-bootstrap') - def toolingProject = project.rootProject.getChildProjects().get('auto-tooling') + def bootstrapProject = project.rootProject.getChildProjects().get('javaagent-bootstrap') + def toolingProject = project.rootProject.getChildProjects().get('javaagent-tooling') project.extensions.create("muzzle", MuzzleExtension, project.objects) // compileMuzzle compiles all projects required to run muzzle validation. diff --git a/docs/contributing/javaagent-jar-components.md b/docs/contributing/javaagent-jar-components.md index d114f20101..89968c7f6a 100644 --- a/docs/contributing/javaagent-jar-components.md +++ b/docs/contributing/javaagent-jar-components.md @@ -9,7 +9,7 @@ into 3 parts: ### Modules that live in the system class loader -#### `opentelemetry-javaagent` module +#### `javaagent` module This module consists of single class `io.opentelemetry.auto.bootstrap.AgentBootstrap` which implements [Java @@ -23,7 +23,7 @@ class from there. ### Modules that live in the bootstrap class loader -#### `agent-bootstrap` module +#### `javaagent-bootstrap` module `io.opentelemetry.auto.bootstrap.Agent` and a few other classes that live in the bootstrap class loader but are not used directly by auto-instrumentation @@ -32,7 +32,7 @@ loader but are not used directly by auto-instrumentation These modules contains support classes for actual instrumentations to be loaded later and separately. These classes should be available from all possible -classloaders in the running application. For this reason `java-agent` puts +classloaders in the running application. For this reason the `javaagent` module puts all these classes into JVM's bootstrap classloader. For the same reason this module should be as small as possible and have as few dependencies as possible. Otherwise, there is a risk of accidentally exposing this classes to @@ -43,7 +43,7 @@ while `auto-api` contains classes that are only needed for auto-instrumentation. ### Modules that live in the agent class loader -#### `agent-tooling` module and `instrumentation` submodules +#### `javaagent-tooling` module and `instrumentation` submodules Contains everything necessary to make instrumentation machinery work, including integration with [ByteBuddy](https://bytebuddy.net/) and actual @@ -51,8 +51,8 @@ library-specific instrumentations. As these classes depend on many classes from different libraries, it is paramount to hide all these classes from the host application. This is achieved in the following way: -- When `java-agent` module builds the final agent, it moves all classes from -`instrumentation` submodules and `agent-tooling` module into a separate +- When `javaagent` module builds the final agent, it moves all classes from +`instrumentation` submodules and `javaagent-tooling` module into a separate folder inside final jar file, called`inst`. In addition, the extension of all class files is changed from `class` to `classdata`. This ensures that general classloaders cannot find nor load these classes. @@ -71,17 +71,17 @@ still access helper classes from bootstrap classloader. #### Agent jar structure If you now look inside -`opentelemetry-javaagent/build/libs/opentelemetry-javaagent--all.jar`, you will see the +`javaagent/build/libs/opentelemetry-javaagent--all.jar`, you will see the following "clusters" of classes: Available in the system class loader: -- `io/opentelemetry/auto/bootstrap/AgentBootstrap` - the one class from `opentelemetry-javaagent` +- `io/opentelemetry/auto/bootstrap/AgentBootstrap` - the one class from `javaagent` module Available in the bootstrap class loader: -- `io/opentelemetry/auto/bootstrap/` - contains the `agent-bootstrap` module +- `io/opentelemetry/auto/bootstrap/` - contains the `javaagent-bootstrap` module - `io/opentelemetry/instrumentation/auto/api/` - contains the `auto-api` module - `io/opentelemetry/auto/shaded/instrumentation/api/` - contains the `instrumentation-api` module, shaded during creation of `javaagent` jar file by Shadow Gradle plugin @@ -91,6 +91,6 @@ Context, both shaded during creation of `javaagent` jar file by Shadow Gradle pl during creation of `javaagent` jar file by Shadow Gradle plugin Available in the agent class loader: -- `inst/` - contains `agent-tooling` module and `instrumentation` submodules, loaded and isolated +- `inst/` - contains `javaagent-tooling` module and `instrumentation` submodules, loaded and isolated inside `AgentClassLoader`. Including OpenTelemetry SDK (and the built-in exporters when using the `-all` artifact). diff --git a/gradle/instrumentation.gradle b/gradle/instrumentation.gradle index 9004cd1ab7..418c8f8166 100644 --- a/gradle/instrumentation.gradle +++ b/gradle/instrumentation.gradle @@ -31,7 +31,7 @@ afterEvaluate { transformation { tasks = ['compileJava', 'compileScala', 'compileKotlin'] plugin = 'io.opentelemetry.auto.tooling.muzzle.MuzzleGradlePlugin' - classPath = project(':auto-tooling').configurations.instrumentationMuzzle + configurations.runtimeClasspath + sourceSets.main.output + classPath = project(':javaagent-tooling').configurations.instrumentationMuzzle + configurations.runtimeClasspath + sourceSets.main.output } } @@ -39,7 +39,7 @@ afterEvaluate { implementation project(':library-api') implementation project(':auto-api') // Apply common dependencies for instrumentation. - implementation(project(':auto-tooling')) { + implementation(project(':javaagent-tooling')) { // OpenTelemetry SDK is not needed for compilation, and :opentelemetry-sdk-shaded-for-testing // is brought in for tests by project(:testing-common) below exclude group: 'io.opentelemetry', module: 'opentelemetry-sdk' diff --git a/gradle/java.gradle b/gradle/java.gradle index 642939855d..25ee447781 100644 --- a/gradle/java.gradle +++ b/gradle/java.gradle @@ -12,7 +12,7 @@ apply from: "$rootDir/gradle/spotbugs.gradle" def applyCodeCoverage = !( project.path.startsWith(":smoke-tests") || //TODO why some tests fail on java 11 if jacoco is present? - project.path == ":opentelemetry-javaagent" || + project.path == ":javaagent" || project.path == ":load-generator" || project.path.startsWith(":benchmark") || project.path.startsWith(":instrumentation")) diff --git a/instrumentation/akka-http-10.0/akka-http-10.0.gradle b/instrumentation/akka-http-10.0/akka-http-10.0.gradle index 400bf8ab1c..751316cb0a 100644 --- a/instrumentation/akka-http-10.0/akka-http-10.0.gradle +++ b/instrumentation/akka-http-10.0/akka-http-10.0.gradle @@ -1,6 +1,6 @@ // Set properties before any plugins get loaded ext { - minJavaVersionForTests = JavaVersion.VERSION_1_8 + minJavaVersionForTests = JavaVersion.VERSION_1_8 } apply from: "$rootDir/gradle/instrumentation.gradle" @@ -8,100 +8,100 @@ apply from: "$rootDir/gradle/test-with-scala.gradle" apply plugin: 'org.unbroken-dome.test-sets' testSets { - lagomTest + lagomTest - version101Test { - dirName = 'test' - } + version101Test { + dirName = 'test' + } - latestDepTest { - dirName = 'test' - } + latestDepTest { + dirName = 'test' + } } compileLagomTestJava { - sourceCompatibility = 1.8 - targetCompatibility = 1.8 + sourceCompatibility = 1.8 + targetCompatibility = 1.8 } compileLagomTestGroovy { - sourceCompatibility = 1.8 - targetCompatibility = 1.8 + sourceCompatibility = 1.8 + targetCompatibility = 1.8 } muzzle { - pass { - group = 'com.typesafe.akka' - module = 'akka-http_2.11' - versions = "[10.0.0,10.1.0)" - // later versions of akka-http expect streams to be provided - extraDependency 'com.typesafe.akka:akka-stream_2.11:2.4.14' - } - pass { - group = 'com.typesafe.akka' - module = 'akka-http_2.12' - versions = "[10.0.0,10.1.0)" - // later versions of akka-http expect streams to be provided - extraDependency 'com.typesafe.akka:akka-stream_2.12:2.4.14' - } - pass { - group = 'com.typesafe.akka' - module = 'akka-http_2.11' - versions = "[10.1.0,)" - // later versions of akka-http expect streams to be provided - extraDependency 'com.typesafe.akka:akka-stream_2.11:2.5.11' - } - pass { - group = 'com.typesafe.akka' - module = 'akka-http_2.12' - versions = "[10.1.0,)" - // later versions of akka-http expect streams to be provided - extraDependency 'com.typesafe.akka:akka-stream_2.12:2.5.11' - } - //There is no akka-http 10.0.x series for scala 2.13 - pass { - group = 'com.typesafe.akka' - module = 'akka-http_2.13' - versions = "[10.1.8,)" - // later versions of akka-http expect streams to be provided - extraDependency 'com.typesafe.akka:akka-stream_2.13:2.5.23' - } + pass { + group = 'com.typesafe.akka' + module = 'akka-http_2.11' + versions = "[10.0.0,10.1.0)" + // later versions of akka-http expect streams to be provided + extraDependency 'com.typesafe.akka:akka-stream_2.11:2.4.14' + } + pass { + group = 'com.typesafe.akka' + module = 'akka-http_2.12' + versions = "[10.0.0,10.1.0)" + // later versions of akka-http expect streams to be provided + extraDependency 'com.typesafe.akka:akka-stream_2.12:2.4.14' + } + pass { + group = 'com.typesafe.akka' + module = 'akka-http_2.11' + versions = "[10.1.0,)" + // later versions of akka-http expect streams to be provided + extraDependency 'com.typesafe.akka:akka-stream_2.11:2.5.11' + } + pass { + group = 'com.typesafe.akka' + module = 'akka-http_2.12' + versions = "[10.1.0,)" + // later versions of akka-http expect streams to be provided + extraDependency 'com.typesafe.akka:akka-stream_2.12:2.5.11' + } + //There is no akka-http 10.0.x series for scala 2.13 + pass { + group = 'com.typesafe.akka' + module = 'akka-http_2.13' + versions = "[10.1.8,)" + // later versions of akka-http expect streams to be provided + extraDependency 'com.typesafe.akka:akka-stream_2.13:2.5.23' + } } dependencies { - compileOnly group: 'com.typesafe.akka', name: 'akka-http_2.11', version: '10.0.0' + compileOnly group: 'com.typesafe.akka', name: 'akka-http_2.11', version: '10.0.0' - implementation project(':auto-tooling') - implementation deps.autoservice - annotationProcessor deps.autoservice + implementation project(':javaagent-tooling') + implementation deps.autoservice + annotationProcessor deps.autoservice - testImplementation group: 'com.typesafe.akka', name: 'akka-http_2.11', version: '10.0.0' - testImplementation group: 'com.squareup.okhttp3', name: 'okhttp', version: '3.6.0' + testImplementation group: 'com.typesafe.akka', name: 'akka-http_2.11', version: '10.0.0' + testImplementation group: 'com.squareup.okhttp3', name: 'okhttp', version: '3.6.0' - lagomTestImplementation project(':instrumentation:akka-http-10.0') + lagomTestImplementation project(':instrumentation:akka-http-10.0') - lagomTestImplementation group: 'com.lightbend.lagom', name: 'lagom-javadsl-testkit_2.11', version: '1.4.0' + lagomTestImplementation group: 'com.lightbend.lagom', name: 'lagom-javadsl-testkit_2.11', version: '1.4.0' - // There are some internal API changes in 10.1 that we would like to test separately for - version101TestImplementation group: 'com.typesafe.akka', name: 'akka-http_2.11', version: '10.1.0' - version101TestImplementation group: 'com.typesafe.akka', name: 'akka-stream_2.11', version: '2.5.11' + // There are some internal API changes in 10.1 that we would like to test separately for + version101TestImplementation group: 'com.typesafe.akka', name: 'akka-http_2.11', version: '10.1.0' + version101TestImplementation group: 'com.typesafe.akka', name: 'akka-stream_2.11', version: '2.5.11' - latestDepTestImplementation group: 'com.typesafe.akka', name: 'akka-http_2.11', version: '+' - latestDepTestImplementation group: 'com.typesafe.akka', name: 'akka-stream_2.11', version: '+' + latestDepTestImplementation group: 'com.typesafe.akka', name: 'akka-http_2.11', version: '+' + latestDepTestImplementation group: 'com.typesafe.akka', name: 'akka-stream_2.11', version: '+' } test.dependsOn lagomTest test.dependsOn version101Test compileVersion101TestGroovy { - classpath = classpath.plus(files(compileVersion101TestScala.destinationDir)) - dependsOn compileVersion101TestScala + classpath = classpath.plus(files(compileVersion101TestScala.destinationDir)) + dependsOn compileVersion101TestScala } compileLatestDepTestGroovy { - classpath = classpath.plus(files(compileLatestDepTestScala.destinationDir)) - dependsOn compileLatestDepTestScala + classpath = classpath.plus(files(compileLatestDepTestScala.destinationDir)) + dependsOn compileLatestDepTestScala } // Lagom test supports running only on java 8 for now. @@ -110,8 +110,8 @@ compileLatestDepTestGroovy { // does not work currently with custom source sets. // They all use the same constraints as the main test source set. lagomTest { - onlyIf { - String java8Home = findJavaHome(JavaVersion.VERSION_1_8) - java8Home != null && executable == toExecutable(java8Home) - } + onlyIf { + String java8Home = findJavaHome(JavaVersion.VERSION_1_8) + java8Home != null && executable == toExecutable(java8Home) + } } diff --git a/instrumentation/elasticsearch/elasticsearch-rest-common/elasticsearch-rest-common.gradle b/instrumentation/elasticsearch/elasticsearch-rest-common/elasticsearch-rest-common.gradle index 8c85037587..378d6a3ad6 100644 --- a/instrumentation/elasticsearch/elasticsearch-rest-common/elasticsearch-rest-common.gradle +++ b/instrumentation/elasticsearch/elasticsearch-rest-common/elasticsearch-rest-common.gradle @@ -1,6 +1,6 @@ apply from: "$rootDir/gradle/instrumentation.gradle" dependencies { - compileOnly group: 'org.elasticsearch.client', name: 'rest', version: '5.0.0' - implementation project(':auto-tooling') + compileOnly group: 'org.elasticsearch.client', name: 'rest', version: '5.0.0' + implementation project(':javaagent-tooling') } diff --git a/instrumentation/elasticsearch/elasticsearch-transport-common/elasticsearch-transport-common.gradle b/instrumentation/elasticsearch/elasticsearch-transport-common/elasticsearch-transport-common.gradle index 67e80a0e09..412b6f3c4a 100644 --- a/instrumentation/elasticsearch/elasticsearch-transport-common/elasticsearch-transport-common.gradle +++ b/instrumentation/elasticsearch/elasticsearch-transport-common/elasticsearch-transport-common.gradle @@ -2,5 +2,5 @@ apply from: "$rootDir/gradle/instrumentation.gradle" dependencies { compileOnly group: 'org.elasticsearch', name: 'elasticsearch', version: '2.0.0' - implementation project(':auto-tooling') + implementation project(':javaagent-tooling') } diff --git a/instrumentation/instrumentation.gradle b/instrumentation/instrumentation.gradle index 321ebff933..412e290910 100644 --- a/instrumentation/instrumentation.gradle +++ b/instrumentation/instrumentation.gradle @@ -36,8 +36,8 @@ subprojects { dependencies { implementation project(':library-api') implementation project(':auto-api') - implementation(project(':auto-tooling')) { - exclude module: ':auto-bootstrap' + implementation(project(':javaagent-tooling')) { + exclude module: ':javaagent-bootstrap' } } @@ -60,7 +60,7 @@ shadowJar { duplicatesStrategy = DuplicatesStrategy.FAIL dependencies { - exclude(project(':auto-bootstrap')) + exclude(project(':javaagent-bootstrap')) } // rewrite library instrumentation dependencies diff --git a/instrumentation/kubernetes-client-7.0/kubernetes-client-7.0.gradle b/instrumentation/kubernetes-client-7.0/kubernetes-client-7.0.gradle index 8c5612c3e2..91cfa80c26 100644 --- a/instrumentation/kubernetes-client-7.0/kubernetes-client-7.0.gradle +++ b/instrumentation/kubernetes-client-7.0/kubernetes-client-7.0.gradle @@ -2,32 +2,32 @@ apply from: "$rootDir/gradle/instrumentation.gradle" apply plugin: 'org.unbroken-dome.test-sets' ext { - minJavaVersionForTests = JavaVersion.VERSION_1_8 + minJavaVersionForTests = JavaVersion.VERSION_1_8 } muzzle { - pass { - group = "io.kubernetes" - module = "client-java-api" - versions = "[7.0.0,)" - assertInverse = true - } + pass { + group = "io.kubernetes" + module = "client-java-api" + versions = "[7.0.0,)" + assertInverse = true + } } testSets { - latestDepTest { - dirName = 'test' - } + latestDepTest { + dirName = 'test' + } } dependencies { - compileOnly(group: 'io.kubernetes', name: 'client-java-api', version: '7.0.0') + compileOnly(group: 'io.kubernetes', name: 'client-java-api', version: '7.0.0') - implementation project(':auto-tooling') + implementation project(':javaagent-tooling') - testImplementation group: 'io.kubernetes', name: 'client-java-api', version: '7.0.0' + testImplementation group: 'io.kubernetes', name: 'client-java-api', version: '7.0.0' - latestDepTestImplementation group: 'io.kubernetes', name: 'client-java-api', version: '+' + latestDepTestImplementation group: 'io.kubernetes', name: 'client-java-api', version: '+' } diff --git a/instrumentation/okhttp/okhttp-2.2/okhttp-2.2.gradle b/instrumentation/okhttp/okhttp-2.2/okhttp-2.2.gradle index 00ce0a741a..ffead9541a 100644 --- a/instrumentation/okhttp/okhttp-2.2/okhttp-2.2.gradle +++ b/instrumentation/okhttp/okhttp-2.2/okhttp-2.2.gradle @@ -23,7 +23,7 @@ testSets { dependencies { compileOnly(group: 'com.squareup.okhttp', name: 'okhttp', version: '2.2.0') - implementation project(':auto-tooling') + implementation project(':javaagent-tooling') testImplementation project(':instrumentation:java-concurrent') testImplementation group: 'com.squareup.okhttp', name: 'okhttp', version: '2.2.0' diff --git a/instrumentation/okhttp/okhttp-3.0/okhttp-3.0.gradle b/instrumentation/okhttp/okhttp-3.0/okhttp-3.0.gradle index 8a8e0808b5..f95aebadee 100644 --- a/instrumentation/okhttp/okhttp-3.0/okhttp-3.0.gradle +++ b/instrumentation/okhttp/okhttp-3.0/okhttp-3.0.gradle @@ -2,18 +2,18 @@ apply from: "$rootDir/gradle/instrumentation.gradle" apply plugin: 'org.unbroken-dome.test-sets' muzzle { - pass { - group = "com.squareup.okhttp3" - module = "okhttp" - versions = "[3.0,)" - assertInverse = true - } + pass { + group = "com.squareup.okhttp3" + module = "okhttp" + versions = "[3.0,)" + assertInverse = true + } } testSets { - latestDepTest { - dirName = 'test' - } + latestDepTest { + dirName = 'test' + } } /* @@ -26,15 +26,15 @@ because it looks like exclusions using configurations excludes dependency even i not transitive. */ dependencies { - compileOnly(group: 'com.squareup.okhttp3', name: 'okhttp', version: '3.0.0') + compileOnly(group: 'com.squareup.okhttp3', name: 'okhttp', version: '3.0.0') - implementation project(':auto-tooling') + implementation project(':javaagent-tooling') - testImplementation(project(':testing-common')) { - exclude module: 'okhttp' - } - testImplementation group: 'com.squareup.okhttp3', name: 'okhttp', version: '3.0.0' + testImplementation(project(':testing-common')) { + exclude module: 'okhttp' + } + testImplementation group: 'com.squareup.okhttp3', name: 'okhttp', version: '3.0.0' - // 4.x.x-alpha has been released and it looks like there are lots of incompatible changes - latestDepTestImplementation group: 'com.squareup.okhttp3', name: 'okhttp', version: '[3.11.0, 4.0.0*)' + // 4.x.x-alpha has been released and it looks like there are lots of incompatible changes + latestDepTestImplementation group: 'com.squareup.okhttp3', name: 'okhttp', version: '[3.11.0, 4.0.0*)' } diff --git a/agent-bootstrap/agent-bootstrap.gradle b/javaagent-bootstrap/javaagent-bootstrap.gradle similarity index 95% rename from agent-bootstrap/agent-bootstrap.gradle rename to javaagent-bootstrap/javaagent-bootstrap.gradle index be62036915..13f560ec51 100644 --- a/agent-bootstrap/agent-bootstrap.gradle +++ b/javaagent-bootstrap/javaagent-bootstrap.gradle @@ -1,3 +1,5 @@ +group = 'io.opentelemetry.javaagent' + apply from: "$rootDir/gradle/java.gradle" apply from: "$rootDir/gradle/publish.gradle" diff --git a/agent-bootstrap/src/main/java/io/opentelemetry/auto/bootstrap/Agent.java b/javaagent-bootstrap/src/main/java/io/opentelemetry/auto/bootstrap/Agent.java similarity index 100% rename from agent-bootstrap/src/main/java/io/opentelemetry/auto/bootstrap/Agent.java rename to javaagent-bootstrap/src/main/java/io/opentelemetry/auto/bootstrap/Agent.java diff --git a/agent-bootstrap/src/main/java/io/opentelemetry/auto/bootstrap/ExceptionLogger.java b/javaagent-bootstrap/src/main/java/io/opentelemetry/auto/bootstrap/ExceptionLogger.java similarity index 100% rename from agent-bootstrap/src/main/java/io/opentelemetry/auto/bootstrap/ExceptionLogger.java rename to javaagent-bootstrap/src/main/java/io/opentelemetry/auto/bootstrap/ExceptionLogger.java diff --git a/agent-bootstrap/src/main/java/io/opentelemetry/auto/bootstrap/FieldBackedContextStoreAppliedMarker.java b/javaagent-bootstrap/src/main/java/io/opentelemetry/auto/bootstrap/FieldBackedContextStoreAppliedMarker.java similarity index 100% rename from agent-bootstrap/src/main/java/io/opentelemetry/auto/bootstrap/FieldBackedContextStoreAppliedMarker.java rename to javaagent-bootstrap/src/main/java/io/opentelemetry/auto/bootstrap/FieldBackedContextStoreAppliedMarker.java diff --git a/agent-bootstrap/src/main/java/io/opentelemetry/auto/bootstrap/PatchLogger.java b/javaagent-bootstrap/src/main/java/io/opentelemetry/auto/bootstrap/PatchLogger.java similarity index 100% rename from agent-bootstrap/src/main/java/io/opentelemetry/auto/bootstrap/PatchLogger.java rename to javaagent-bootstrap/src/main/java/io/opentelemetry/auto/bootstrap/PatchLogger.java diff --git a/agent-bootstrap/src/main/java/io/opentelemetry/auto/bootstrap/WeakCache.java b/javaagent-bootstrap/src/main/java/io/opentelemetry/auto/bootstrap/WeakCache.java similarity index 100% rename from agent-bootstrap/src/main/java/io/opentelemetry/auto/bootstrap/WeakCache.java rename to javaagent-bootstrap/src/main/java/io/opentelemetry/auto/bootstrap/WeakCache.java diff --git a/agent-bootstrap/src/main/java/io/opentelemetry/auto/bootstrap/spi/TracerCustomizer.java b/javaagent-bootstrap/src/main/java/io/opentelemetry/auto/bootstrap/spi/TracerCustomizer.java similarity index 100% rename from agent-bootstrap/src/main/java/io/opentelemetry/auto/bootstrap/spi/TracerCustomizer.java rename to javaagent-bootstrap/src/main/java/io/opentelemetry/auto/bootstrap/spi/TracerCustomizer.java diff --git a/agent-bootstrap/src/test/java/io/opentelemetry/auto/bootstrap/PatchLoggerTest.java b/javaagent-bootstrap/src/test/java/io/opentelemetry/auto/bootstrap/PatchLoggerTest.java similarity index 100% rename from agent-bootstrap/src/test/java/io/opentelemetry/auto/bootstrap/PatchLoggerTest.java rename to javaagent-bootstrap/src/test/java/io/opentelemetry/auto/bootstrap/PatchLoggerTest.java diff --git a/agent-tooling/agent-tooling.gradle b/javaagent-tooling/javaagent-tooling.gradle similarity index 94% rename from agent-tooling/agent-tooling.gradle rename to javaagent-tooling/javaagent-tooling.gradle index d887d5e361..e1d50db219 100644 --- a/agent-tooling/agent-tooling.gradle +++ b/javaagent-tooling/javaagent-tooling.gradle @@ -1,3 +1,5 @@ +group = 'io.opentelemetry.javaagent' + apply from: "$rootDir/gradle/java.gradle" apply from: "$rootDir/gradle/publish.gradle" @@ -11,7 +13,7 @@ configurations { } dependencies { - implementation project(':auto-bootstrap') + implementation project(':javaagent-bootstrap') implementation project(':auto-api') implementation project(':library-api') implementation project(':utils:thread-utils') diff --git a/agent-tooling/src/main/java/io/opentelemetry/auto/tooling/AgentInstaller.java b/javaagent-tooling/src/main/java/io/opentelemetry/auto/tooling/AgentInstaller.java similarity index 100% rename from agent-tooling/src/main/java/io/opentelemetry/auto/tooling/AgentInstaller.java rename to javaagent-tooling/src/main/java/io/opentelemetry/auto/tooling/AgentInstaller.java diff --git a/agent-tooling/src/main/java/io/opentelemetry/auto/tooling/AgentTooling.java b/javaagent-tooling/src/main/java/io/opentelemetry/auto/tooling/AgentTooling.java similarity index 100% rename from agent-tooling/src/main/java/io/opentelemetry/auto/tooling/AgentTooling.java rename to javaagent-tooling/src/main/java/io/opentelemetry/auto/tooling/AgentTooling.java diff --git a/agent-tooling/src/main/java/io/opentelemetry/auto/tooling/ClassHierarchyIterable.java b/javaagent-tooling/src/main/java/io/opentelemetry/auto/tooling/ClassHierarchyIterable.java similarity index 100% rename from agent-tooling/src/main/java/io/opentelemetry/auto/tooling/ClassHierarchyIterable.java rename to javaagent-tooling/src/main/java/io/opentelemetry/auto/tooling/ClassHierarchyIterable.java diff --git a/agent-tooling/src/main/java/io/opentelemetry/auto/tooling/ClassLoaderMatcher.java b/javaagent-tooling/src/main/java/io/opentelemetry/auto/tooling/ClassLoaderMatcher.java similarity index 100% rename from agent-tooling/src/main/java/io/opentelemetry/auto/tooling/ClassLoaderMatcher.java rename to javaagent-tooling/src/main/java/io/opentelemetry/auto/tooling/ClassLoaderMatcher.java diff --git a/agent-tooling/src/main/java/io/opentelemetry/auto/tooling/Constants.java b/javaagent-tooling/src/main/java/io/opentelemetry/auto/tooling/Constants.java similarity index 100% rename from agent-tooling/src/main/java/io/opentelemetry/auto/tooling/Constants.java rename to javaagent-tooling/src/main/java/io/opentelemetry/auto/tooling/Constants.java diff --git a/agent-tooling/src/main/java/io/opentelemetry/auto/tooling/DefaultExporterConfig.java b/javaagent-tooling/src/main/java/io/opentelemetry/auto/tooling/DefaultExporterConfig.java similarity index 100% rename from agent-tooling/src/main/java/io/opentelemetry/auto/tooling/DefaultExporterConfig.java rename to javaagent-tooling/src/main/java/io/opentelemetry/auto/tooling/DefaultExporterConfig.java diff --git a/agent-tooling/src/main/java/io/opentelemetry/auto/tooling/ExporterClassLoader.java b/javaagent-tooling/src/main/java/io/opentelemetry/auto/tooling/ExporterClassLoader.java similarity index 100% rename from agent-tooling/src/main/java/io/opentelemetry/auto/tooling/ExporterClassLoader.java rename to javaagent-tooling/src/main/java/io/opentelemetry/auto/tooling/ExporterClassLoader.java diff --git a/agent-tooling/src/main/java/io/opentelemetry/auto/tooling/GuavaWeakCache.java b/javaagent-tooling/src/main/java/io/opentelemetry/auto/tooling/GuavaWeakCache.java similarity index 100% rename from agent-tooling/src/main/java/io/opentelemetry/auto/tooling/GuavaWeakCache.java rename to javaagent-tooling/src/main/java/io/opentelemetry/auto/tooling/GuavaWeakCache.java diff --git a/agent-tooling/src/main/java/io/opentelemetry/auto/tooling/HelperInjector.java b/javaagent-tooling/src/main/java/io/opentelemetry/auto/tooling/HelperInjector.java similarity index 100% rename from agent-tooling/src/main/java/io/opentelemetry/auto/tooling/HelperInjector.java rename to javaagent-tooling/src/main/java/io/opentelemetry/auto/tooling/HelperInjector.java diff --git a/agent-tooling/src/main/java/io/opentelemetry/auto/tooling/Instrumenter.java b/javaagent-tooling/src/main/java/io/opentelemetry/auto/tooling/Instrumenter.java similarity index 100% rename from agent-tooling/src/main/java/io/opentelemetry/auto/tooling/Instrumenter.java rename to javaagent-tooling/src/main/java/io/opentelemetry/auto/tooling/Instrumenter.java diff --git a/agent-tooling/src/main/java/io/opentelemetry/auto/tooling/PropagatorsInitializer.java b/javaagent-tooling/src/main/java/io/opentelemetry/auto/tooling/PropagatorsInitializer.java similarity index 100% rename from agent-tooling/src/main/java/io/opentelemetry/auto/tooling/PropagatorsInitializer.java rename to javaagent-tooling/src/main/java/io/opentelemetry/auto/tooling/PropagatorsInitializer.java diff --git a/agent-tooling/src/main/java/io/opentelemetry/auto/tooling/ShadingRemapper.java b/javaagent-tooling/src/main/java/io/opentelemetry/auto/tooling/ShadingRemapper.java similarity index 100% rename from agent-tooling/src/main/java/io/opentelemetry/auto/tooling/ShadingRemapper.java rename to javaagent-tooling/src/main/java/io/opentelemetry/auto/tooling/ShadingRemapper.java diff --git a/agent-tooling/src/main/java/io/opentelemetry/auto/tooling/TracerInstaller.java b/javaagent-tooling/src/main/java/io/opentelemetry/auto/tooling/TracerInstaller.java similarity index 100% rename from agent-tooling/src/main/java/io/opentelemetry/auto/tooling/TracerInstaller.java rename to javaagent-tooling/src/main/java/io/opentelemetry/auto/tooling/TracerInstaller.java diff --git a/agent-tooling/src/main/java/io/opentelemetry/auto/tooling/Utils.java b/javaagent-tooling/src/main/java/io/opentelemetry/auto/tooling/Utils.java similarity index 100% rename from agent-tooling/src/main/java/io/opentelemetry/auto/tooling/Utils.java rename to javaagent-tooling/src/main/java/io/opentelemetry/auto/tooling/Utils.java diff --git a/agent-tooling/src/main/java/io/opentelemetry/auto/tooling/VersionLogger.java b/javaagent-tooling/src/main/java/io/opentelemetry/auto/tooling/VersionLogger.java similarity index 100% rename from agent-tooling/src/main/java/io/opentelemetry/auto/tooling/VersionLogger.java rename to javaagent-tooling/src/main/java/io/opentelemetry/auto/tooling/VersionLogger.java diff --git a/agent-tooling/src/main/java/io/opentelemetry/auto/tooling/WeakMapSuppliers.java b/javaagent-tooling/src/main/java/io/opentelemetry/auto/tooling/WeakMapSuppliers.java similarity index 100% rename from agent-tooling/src/main/java/io/opentelemetry/auto/tooling/WeakMapSuppliers.java rename to javaagent-tooling/src/main/java/io/opentelemetry/auto/tooling/WeakMapSuppliers.java diff --git a/agent-tooling/src/main/java/io/opentelemetry/auto/tooling/bytebuddy/AgentCachingPoolStrategy.java b/javaagent-tooling/src/main/java/io/opentelemetry/auto/tooling/bytebuddy/AgentCachingPoolStrategy.java similarity index 100% rename from agent-tooling/src/main/java/io/opentelemetry/auto/tooling/bytebuddy/AgentCachingPoolStrategy.java rename to javaagent-tooling/src/main/java/io/opentelemetry/auto/tooling/bytebuddy/AgentCachingPoolStrategy.java diff --git a/agent-tooling/src/main/java/io/opentelemetry/auto/tooling/bytebuddy/AgentLocationStrategy.java b/javaagent-tooling/src/main/java/io/opentelemetry/auto/tooling/bytebuddy/AgentLocationStrategy.java similarity index 100% rename from agent-tooling/src/main/java/io/opentelemetry/auto/tooling/bytebuddy/AgentLocationStrategy.java rename to javaagent-tooling/src/main/java/io/opentelemetry/auto/tooling/bytebuddy/AgentLocationStrategy.java diff --git a/agent-tooling/src/main/java/io/opentelemetry/auto/tooling/bytebuddy/AgentTransformers.java b/javaagent-tooling/src/main/java/io/opentelemetry/auto/tooling/bytebuddy/AgentTransformers.java similarity index 100% rename from agent-tooling/src/main/java/io/opentelemetry/auto/tooling/bytebuddy/AgentTransformers.java rename to javaagent-tooling/src/main/java/io/opentelemetry/auto/tooling/bytebuddy/AgentTransformers.java diff --git a/agent-tooling/src/main/java/io/opentelemetry/auto/tooling/bytebuddy/ExceptionHandlers.java b/javaagent-tooling/src/main/java/io/opentelemetry/auto/tooling/bytebuddy/ExceptionHandlers.java similarity index 100% rename from agent-tooling/src/main/java/io/opentelemetry/auto/tooling/bytebuddy/ExceptionHandlers.java rename to javaagent-tooling/src/main/java/io/opentelemetry/auto/tooling/bytebuddy/ExceptionHandlers.java diff --git a/agent-tooling/src/main/java/io/opentelemetry/auto/tooling/bytebuddy/matcher/AgentElementMatchers.java b/javaagent-tooling/src/main/java/io/opentelemetry/auto/tooling/bytebuddy/matcher/AgentElementMatchers.java similarity index 100% rename from agent-tooling/src/main/java/io/opentelemetry/auto/tooling/bytebuddy/matcher/AgentElementMatchers.java rename to javaagent-tooling/src/main/java/io/opentelemetry/auto/tooling/bytebuddy/matcher/AgentElementMatchers.java diff --git a/agent-tooling/src/main/java/io/opentelemetry/auto/tooling/bytebuddy/matcher/HasSuperMethodMatcher.java b/javaagent-tooling/src/main/java/io/opentelemetry/auto/tooling/bytebuddy/matcher/HasSuperMethodMatcher.java similarity index 100% rename from agent-tooling/src/main/java/io/opentelemetry/auto/tooling/bytebuddy/matcher/HasSuperMethodMatcher.java rename to javaagent-tooling/src/main/java/io/opentelemetry/auto/tooling/bytebuddy/matcher/HasSuperMethodMatcher.java diff --git a/agent-tooling/src/main/java/io/opentelemetry/auto/tooling/bytebuddy/matcher/LoggingFailSafeMatcher.java b/javaagent-tooling/src/main/java/io/opentelemetry/auto/tooling/bytebuddy/matcher/LoggingFailSafeMatcher.java similarity index 100% rename from agent-tooling/src/main/java/io/opentelemetry/auto/tooling/bytebuddy/matcher/LoggingFailSafeMatcher.java rename to javaagent-tooling/src/main/java/io/opentelemetry/auto/tooling/bytebuddy/matcher/LoggingFailSafeMatcher.java diff --git a/agent-tooling/src/main/java/io/opentelemetry/auto/tooling/bytebuddy/matcher/SafeErasureMatcher.java b/javaagent-tooling/src/main/java/io/opentelemetry/auto/tooling/bytebuddy/matcher/SafeErasureMatcher.java similarity index 100% rename from agent-tooling/src/main/java/io/opentelemetry/auto/tooling/bytebuddy/matcher/SafeErasureMatcher.java rename to javaagent-tooling/src/main/java/io/opentelemetry/auto/tooling/bytebuddy/matcher/SafeErasureMatcher.java diff --git a/agent-tooling/src/main/java/io/opentelemetry/auto/tooling/bytebuddy/matcher/SafeExtendsClassMatcher.java b/javaagent-tooling/src/main/java/io/opentelemetry/auto/tooling/bytebuddy/matcher/SafeExtendsClassMatcher.java similarity index 100% rename from agent-tooling/src/main/java/io/opentelemetry/auto/tooling/bytebuddy/matcher/SafeExtendsClassMatcher.java rename to javaagent-tooling/src/main/java/io/opentelemetry/auto/tooling/bytebuddy/matcher/SafeExtendsClassMatcher.java diff --git a/agent-tooling/src/main/java/io/opentelemetry/auto/tooling/bytebuddy/matcher/SafeHasSuperTypeMatcher.java b/javaagent-tooling/src/main/java/io/opentelemetry/auto/tooling/bytebuddy/matcher/SafeHasSuperTypeMatcher.java similarity index 100% rename from agent-tooling/src/main/java/io/opentelemetry/auto/tooling/bytebuddy/matcher/SafeHasSuperTypeMatcher.java rename to javaagent-tooling/src/main/java/io/opentelemetry/auto/tooling/bytebuddy/matcher/SafeHasSuperTypeMatcher.java diff --git a/agent-tooling/src/main/java/io/opentelemetry/auto/tooling/context/FieldBackedProvider.java b/javaagent-tooling/src/main/java/io/opentelemetry/auto/tooling/context/FieldBackedProvider.java similarity index 100% rename from agent-tooling/src/main/java/io/opentelemetry/auto/tooling/context/FieldBackedProvider.java rename to javaagent-tooling/src/main/java/io/opentelemetry/auto/tooling/context/FieldBackedProvider.java diff --git a/agent-tooling/src/main/java/io/opentelemetry/auto/tooling/context/InstrumentationContextProvider.java b/javaagent-tooling/src/main/java/io/opentelemetry/auto/tooling/context/InstrumentationContextProvider.java similarity index 100% rename from agent-tooling/src/main/java/io/opentelemetry/auto/tooling/context/InstrumentationContextProvider.java rename to javaagent-tooling/src/main/java/io/opentelemetry/auto/tooling/context/InstrumentationContextProvider.java diff --git a/agent-tooling/src/main/java/io/opentelemetry/auto/tooling/context/NoopContextProvider.java b/javaagent-tooling/src/main/java/io/opentelemetry/auto/tooling/context/NoopContextProvider.java similarity index 100% rename from agent-tooling/src/main/java/io/opentelemetry/auto/tooling/context/NoopContextProvider.java rename to javaagent-tooling/src/main/java/io/opentelemetry/auto/tooling/context/NoopContextProvider.java diff --git a/agent-tooling/src/main/java/io/opentelemetry/auto/tooling/log/LogContextScopeListener.java b/javaagent-tooling/src/main/java/io/opentelemetry/auto/tooling/log/LogContextScopeListener.java similarity index 100% rename from agent-tooling/src/main/java/io/opentelemetry/auto/tooling/log/LogContextScopeListener.java rename to javaagent-tooling/src/main/java/io/opentelemetry/auto/tooling/log/LogContextScopeListener.java diff --git a/agent-tooling/src/main/java/io/opentelemetry/auto/tooling/matcher/AdditionalLibraryIgnoresMatcher.java b/javaagent-tooling/src/main/java/io/opentelemetry/auto/tooling/matcher/AdditionalLibraryIgnoresMatcher.java similarity index 100% rename from agent-tooling/src/main/java/io/opentelemetry/auto/tooling/matcher/AdditionalLibraryIgnoresMatcher.java rename to javaagent-tooling/src/main/java/io/opentelemetry/auto/tooling/matcher/AdditionalLibraryIgnoresMatcher.java diff --git a/agent-tooling/src/main/java/io/opentelemetry/auto/tooling/matcher/GlobalIgnoresMatcher.java b/javaagent-tooling/src/main/java/io/opentelemetry/auto/tooling/matcher/GlobalIgnoresMatcher.java similarity index 100% rename from agent-tooling/src/main/java/io/opentelemetry/auto/tooling/matcher/GlobalIgnoresMatcher.java rename to javaagent-tooling/src/main/java/io/opentelemetry/auto/tooling/matcher/GlobalIgnoresMatcher.java diff --git a/agent-tooling/src/main/java/io/opentelemetry/auto/tooling/matcher/NameMatchers.java b/javaagent-tooling/src/main/java/io/opentelemetry/auto/tooling/matcher/NameMatchers.java similarity index 100% rename from agent-tooling/src/main/java/io/opentelemetry/auto/tooling/matcher/NameMatchers.java rename to javaagent-tooling/src/main/java/io/opentelemetry/auto/tooling/matcher/NameMatchers.java diff --git a/agent-tooling/src/main/java/io/opentelemetry/auto/tooling/muzzle/MuzzleGradlePlugin.java b/javaagent-tooling/src/main/java/io/opentelemetry/auto/tooling/muzzle/MuzzleGradlePlugin.java similarity index 100% rename from agent-tooling/src/main/java/io/opentelemetry/auto/tooling/muzzle/MuzzleGradlePlugin.java rename to javaagent-tooling/src/main/java/io/opentelemetry/auto/tooling/muzzle/MuzzleGradlePlugin.java diff --git a/agent-tooling/src/main/java/io/opentelemetry/auto/tooling/muzzle/MuzzleVersionScanPlugin.java b/javaagent-tooling/src/main/java/io/opentelemetry/auto/tooling/muzzle/MuzzleVersionScanPlugin.java similarity index 100% rename from agent-tooling/src/main/java/io/opentelemetry/auto/tooling/muzzle/MuzzleVersionScanPlugin.java rename to javaagent-tooling/src/main/java/io/opentelemetry/auto/tooling/muzzle/MuzzleVersionScanPlugin.java diff --git a/agent-tooling/src/main/java/io/opentelemetry/auto/tooling/muzzle/MuzzleVisitor.java b/javaagent-tooling/src/main/java/io/opentelemetry/auto/tooling/muzzle/MuzzleVisitor.java similarity index 100% rename from agent-tooling/src/main/java/io/opentelemetry/auto/tooling/muzzle/MuzzleVisitor.java rename to javaagent-tooling/src/main/java/io/opentelemetry/auto/tooling/muzzle/MuzzleVisitor.java diff --git a/agent-tooling/src/main/java/io/opentelemetry/auto/tooling/muzzle/Reference.java b/javaagent-tooling/src/main/java/io/opentelemetry/auto/tooling/muzzle/Reference.java similarity index 100% rename from agent-tooling/src/main/java/io/opentelemetry/auto/tooling/muzzle/Reference.java rename to javaagent-tooling/src/main/java/io/opentelemetry/auto/tooling/muzzle/Reference.java diff --git a/agent-tooling/src/main/java/io/opentelemetry/auto/tooling/muzzle/ReferenceCreator.java b/javaagent-tooling/src/main/java/io/opentelemetry/auto/tooling/muzzle/ReferenceCreator.java similarity index 100% rename from agent-tooling/src/main/java/io/opentelemetry/auto/tooling/muzzle/ReferenceCreator.java rename to javaagent-tooling/src/main/java/io/opentelemetry/auto/tooling/muzzle/ReferenceCreator.java diff --git a/agent-tooling/src/main/java/io/opentelemetry/auto/tooling/muzzle/ReferenceMatcher.java b/javaagent-tooling/src/main/java/io/opentelemetry/auto/tooling/muzzle/ReferenceMatcher.java similarity index 100% rename from agent-tooling/src/main/java/io/opentelemetry/auto/tooling/muzzle/ReferenceMatcher.java rename to javaagent-tooling/src/main/java/io/opentelemetry/auto/tooling/muzzle/ReferenceMatcher.java diff --git a/agent-tooling/src/main/java/io/opentelemetry/auto/typed/base/BaseTypedSpan.java b/javaagent-tooling/src/main/java/io/opentelemetry/auto/typed/base/BaseTypedSpan.java similarity index 100% rename from agent-tooling/src/main/java/io/opentelemetry/auto/typed/base/BaseTypedSpan.java rename to javaagent-tooling/src/main/java/io/opentelemetry/auto/typed/base/BaseTypedSpan.java diff --git a/agent-tooling/src/main/java/io/opentelemetry/auto/typed/base/BaseTypedTracer.java b/javaagent-tooling/src/main/java/io/opentelemetry/auto/typed/base/BaseTypedTracer.java similarity index 100% rename from agent-tooling/src/main/java/io/opentelemetry/auto/typed/base/BaseTypedTracer.java rename to javaagent-tooling/src/main/java/io/opentelemetry/auto/typed/base/BaseTypedTracer.java diff --git a/agent-tooling/src/main/java/io/opentelemetry/auto/typed/base/DelegatingSpan.java b/javaagent-tooling/src/main/java/io/opentelemetry/auto/typed/base/DelegatingSpan.java similarity index 100% rename from agent-tooling/src/main/java/io/opentelemetry/auto/typed/base/DelegatingSpan.java rename to javaagent-tooling/src/main/java/io/opentelemetry/auto/typed/base/DelegatingSpan.java diff --git a/agent-tooling/src/main/java/io/opentelemetry/auto/typed/client/ClientTypedSpan.java b/javaagent-tooling/src/main/java/io/opentelemetry/auto/typed/client/ClientTypedSpan.java similarity index 100% rename from agent-tooling/src/main/java/io/opentelemetry/auto/typed/client/ClientTypedSpan.java rename to javaagent-tooling/src/main/java/io/opentelemetry/auto/typed/client/ClientTypedSpan.java diff --git a/agent-tooling/src/main/java/io/opentelemetry/auto/typed/client/ClientTypedTracer.java b/javaagent-tooling/src/main/java/io/opentelemetry/auto/typed/client/ClientTypedTracer.java similarity index 100% rename from agent-tooling/src/main/java/io/opentelemetry/auto/typed/client/ClientTypedTracer.java rename to javaagent-tooling/src/main/java/io/opentelemetry/auto/typed/client/ClientTypedTracer.java diff --git a/agent-tooling/src/main/java/io/opentelemetry/auto/typed/client/http/HttpClientTypedSpan.java b/javaagent-tooling/src/main/java/io/opentelemetry/auto/typed/client/http/HttpClientTypedSpan.java similarity index 100% rename from agent-tooling/src/main/java/io/opentelemetry/auto/typed/client/http/HttpClientTypedSpan.java rename to javaagent-tooling/src/main/java/io/opentelemetry/auto/typed/client/http/HttpClientTypedSpan.java diff --git a/agent-tooling/src/main/java/io/opentelemetry/auto/typed/client/http/HttpClientTypedTracer.java b/javaagent-tooling/src/main/java/io/opentelemetry/auto/typed/client/http/HttpClientTypedTracer.java similarity index 100% rename from agent-tooling/src/main/java/io/opentelemetry/auto/typed/client/http/HttpClientTypedTracer.java rename to javaagent-tooling/src/main/java/io/opentelemetry/auto/typed/client/http/HttpClientTypedTracer.java diff --git a/agent-tooling/src/main/java/io/opentelemetry/auto/typed/server/ServerTypedSpan.java b/javaagent-tooling/src/main/java/io/opentelemetry/auto/typed/server/ServerTypedSpan.java similarity index 100% rename from agent-tooling/src/main/java/io/opentelemetry/auto/typed/server/ServerTypedSpan.java rename to javaagent-tooling/src/main/java/io/opentelemetry/auto/typed/server/ServerTypedSpan.java diff --git a/agent-tooling/src/main/java/io/opentelemetry/auto/typed/server/ServerTypedTracer.java b/javaagent-tooling/src/main/java/io/opentelemetry/auto/typed/server/ServerTypedTracer.java similarity index 100% rename from agent-tooling/src/main/java/io/opentelemetry/auto/typed/server/ServerTypedTracer.java rename to javaagent-tooling/src/main/java/io/opentelemetry/auto/typed/server/ServerTypedTracer.java diff --git a/agent-tooling/src/main/java/io/opentelemetry/auto/typed/server/http/HttpServerTypedSpan.java b/javaagent-tooling/src/main/java/io/opentelemetry/auto/typed/server/http/HttpServerTypedSpan.java similarity index 100% rename from agent-tooling/src/main/java/io/opentelemetry/auto/typed/server/http/HttpServerTypedSpan.java rename to javaagent-tooling/src/main/java/io/opentelemetry/auto/typed/server/http/HttpServerTypedSpan.java diff --git a/agent-tooling/src/main/java/io/opentelemetry/auto/typed/server/http/HttpServerTypedTracer.java b/javaagent-tooling/src/main/java/io/opentelemetry/auto/typed/server/http/HttpServerTypedTracer.java similarity index 100% rename from agent-tooling/src/main/java/io/opentelemetry/auto/typed/server/http/HttpServerTypedTracer.java rename to javaagent-tooling/src/main/java/io/opentelemetry/auto/typed/server/http/HttpServerTypedTracer.java diff --git a/agent-tooling/src/test/groovy/io/opentelemetry/auto/test/ClassLoaderMatcherTest.groovy b/javaagent-tooling/src/test/groovy/io/opentelemetry/auto/test/ClassLoaderMatcherTest.groovy similarity index 100% rename from agent-tooling/src/test/groovy/io/opentelemetry/auto/test/ClassLoaderMatcherTest.groovy rename to javaagent-tooling/src/test/groovy/io/opentelemetry/auto/test/ClassLoaderMatcherTest.groovy diff --git a/agent-tooling/src/test/groovy/io/opentelemetry/auto/test/DefaultInstrumenterTest.groovy b/javaagent-tooling/src/test/groovy/io/opentelemetry/auto/test/DefaultInstrumenterTest.groovy similarity index 100% rename from agent-tooling/src/test/groovy/io/opentelemetry/auto/test/DefaultInstrumenterTest.groovy rename to javaagent-tooling/src/test/groovy/io/opentelemetry/auto/test/DefaultInstrumenterTest.groovy diff --git a/agent-tooling/src/test/groovy/io/opentelemetry/auto/test/ExceptionHandlerTest.groovy b/javaagent-tooling/src/test/groovy/io/opentelemetry/auto/test/ExceptionHandlerTest.groovy similarity index 100% rename from agent-tooling/src/test/groovy/io/opentelemetry/auto/test/ExceptionHandlerTest.groovy rename to javaagent-tooling/src/test/groovy/io/opentelemetry/auto/test/ExceptionHandlerTest.groovy diff --git a/agent-tooling/src/test/groovy/io/opentelemetry/auto/test/HelperInjectionTest.groovy b/javaagent-tooling/src/test/groovy/io/opentelemetry/auto/test/HelperInjectionTest.groovy similarity index 100% rename from agent-tooling/src/test/groovy/io/opentelemetry/auto/test/HelperInjectionTest.groovy rename to javaagent-tooling/src/test/groovy/io/opentelemetry/auto/test/HelperInjectionTest.groovy diff --git a/agent-tooling/src/test/groovy/io/opentelemetry/auto/test/ResourceLocatingTest.groovy b/javaagent-tooling/src/test/groovy/io/opentelemetry/auto/test/ResourceLocatingTest.groovy similarity index 100% rename from agent-tooling/src/test/groovy/io/opentelemetry/auto/test/ResourceLocatingTest.groovy rename to javaagent-tooling/src/test/groovy/io/opentelemetry/auto/test/ResourceLocatingTest.groovy diff --git a/agent-tooling/src/test/groovy/io/opentelemetry/auto/tooling/CacheProviderTest.groovy b/javaagent-tooling/src/test/groovy/io/opentelemetry/auto/tooling/CacheProviderTest.groovy similarity index 100% rename from agent-tooling/src/test/groovy/io/opentelemetry/auto/tooling/CacheProviderTest.groovy rename to javaagent-tooling/src/test/groovy/io/opentelemetry/auto/tooling/CacheProviderTest.groovy diff --git a/agent-tooling/src/test/groovy/io/opentelemetry/auto/tooling/ExporterClassLoaderTest.groovy b/javaagent-tooling/src/test/groovy/io/opentelemetry/auto/tooling/ExporterClassLoaderTest.groovy similarity index 100% rename from agent-tooling/src/test/groovy/io/opentelemetry/auto/tooling/ExporterClassLoaderTest.groovy rename to javaagent-tooling/src/test/groovy/io/opentelemetry/auto/tooling/ExporterClassLoaderTest.groovy diff --git a/agent-tooling/src/test/groovy/io/opentelemetry/auto/tooling/UtilsTest.groovy b/javaagent-tooling/src/test/groovy/io/opentelemetry/auto/tooling/UtilsTest.groovy similarity index 100% rename from agent-tooling/src/test/groovy/io/opentelemetry/auto/tooling/UtilsTest.groovy rename to javaagent-tooling/src/test/groovy/io/opentelemetry/auto/tooling/UtilsTest.groovy diff --git a/agent-tooling/src/test/groovy/io/opentelemetry/auto/tooling/WeakCacheTest.groovy b/javaagent-tooling/src/test/groovy/io/opentelemetry/auto/tooling/WeakCacheTest.groovy similarity index 100% rename from agent-tooling/src/test/groovy/io/opentelemetry/auto/tooling/WeakCacheTest.groovy rename to javaagent-tooling/src/test/groovy/io/opentelemetry/auto/tooling/WeakCacheTest.groovy diff --git a/agent-tooling/src/test/groovy/io/opentelemetry/auto/tooling/WeakConcurrentSupplierTest.groovy b/javaagent-tooling/src/test/groovy/io/opentelemetry/auto/tooling/WeakConcurrentSupplierTest.groovy similarity index 100% rename from agent-tooling/src/test/groovy/io/opentelemetry/auto/tooling/WeakConcurrentSupplierTest.groovy rename to javaagent-tooling/src/test/groovy/io/opentelemetry/auto/tooling/WeakConcurrentSupplierTest.groovy diff --git a/agent-tooling/src/test/groovy/io/opentelemetry/auto/tooling/bytebuddy/matcher/ExtendsClassMatcherTest.groovy b/javaagent-tooling/src/test/groovy/io/opentelemetry/auto/tooling/bytebuddy/matcher/ExtendsClassMatcherTest.groovy similarity index 100% rename from agent-tooling/src/test/groovy/io/opentelemetry/auto/tooling/bytebuddy/matcher/ExtendsClassMatcherTest.groovy rename to javaagent-tooling/src/test/groovy/io/opentelemetry/auto/tooling/bytebuddy/matcher/ExtendsClassMatcherTest.groovy diff --git a/agent-tooling/src/test/groovy/io/opentelemetry/auto/tooling/bytebuddy/matcher/HasInterfaceMatcherTest.groovy b/javaagent-tooling/src/test/groovy/io/opentelemetry/auto/tooling/bytebuddy/matcher/HasInterfaceMatcherTest.groovy similarity index 100% rename from agent-tooling/src/test/groovy/io/opentelemetry/auto/tooling/bytebuddy/matcher/HasInterfaceMatcherTest.groovy rename to javaagent-tooling/src/test/groovy/io/opentelemetry/auto/tooling/bytebuddy/matcher/HasInterfaceMatcherTest.groovy diff --git a/agent-tooling/src/test/groovy/io/opentelemetry/auto/tooling/bytebuddy/matcher/HasSuperMethodMatcherTest.groovy b/javaagent-tooling/src/test/groovy/io/opentelemetry/auto/tooling/bytebuddy/matcher/HasSuperMethodMatcherTest.groovy similarity index 100% rename from agent-tooling/src/test/groovy/io/opentelemetry/auto/tooling/bytebuddy/matcher/HasSuperMethodMatcherTest.groovy rename to javaagent-tooling/src/test/groovy/io/opentelemetry/auto/tooling/bytebuddy/matcher/HasSuperMethodMatcherTest.groovy diff --git a/agent-tooling/src/test/groovy/io/opentelemetry/auto/tooling/bytebuddy/matcher/ImplementsInterfaceMatcherTest.groovy b/javaagent-tooling/src/test/groovy/io/opentelemetry/auto/tooling/bytebuddy/matcher/ImplementsInterfaceMatcherTest.groovy similarity index 100% rename from agent-tooling/src/test/groovy/io/opentelemetry/auto/tooling/bytebuddy/matcher/ImplementsInterfaceMatcherTest.groovy rename to javaagent-tooling/src/test/groovy/io/opentelemetry/auto/tooling/bytebuddy/matcher/ImplementsInterfaceMatcherTest.groovy diff --git a/agent-tooling/src/test/groovy/io/opentelemetry/auto/tooling/bytebuddy/matcher/NameMatchersTest.groovy b/javaagent-tooling/src/test/groovy/io/opentelemetry/auto/tooling/bytebuddy/matcher/NameMatchersTest.groovy similarity index 100% rename from agent-tooling/src/test/groovy/io/opentelemetry/auto/tooling/bytebuddy/matcher/NameMatchersTest.groovy rename to javaagent-tooling/src/test/groovy/io/opentelemetry/auto/tooling/bytebuddy/matcher/NameMatchersTest.groovy diff --git a/agent-tooling/src/test/groovy/io/opentelemetry/auto/tooling/bytebuddy/matcher/SafeHasSuperTypeMatcherTest.groovy b/javaagent-tooling/src/test/groovy/io/opentelemetry/auto/tooling/bytebuddy/matcher/SafeHasSuperTypeMatcherTest.groovy similarity index 100% rename from agent-tooling/src/test/groovy/io/opentelemetry/auto/tooling/bytebuddy/matcher/SafeHasSuperTypeMatcherTest.groovy rename to javaagent-tooling/src/test/groovy/io/opentelemetry/auto/tooling/bytebuddy/matcher/SafeHasSuperTypeMatcherTest.groovy diff --git a/agent-tooling/src/test/groovy/io/opentelemetry/auto/tooling/bytebuddy/matcher/SafeMatcherTest.groovy b/javaagent-tooling/src/test/groovy/io/opentelemetry/auto/tooling/bytebuddy/matcher/SafeMatcherTest.groovy similarity index 100% rename from agent-tooling/src/test/groovy/io/opentelemetry/auto/tooling/bytebuddy/matcher/SafeMatcherTest.groovy rename to javaagent-tooling/src/test/groovy/io/opentelemetry/auto/tooling/bytebuddy/matcher/SafeMatcherTest.groovy diff --git a/agent-tooling/src/test/groovy/io/opentelemetry/auto/tooling/bytebuddy/matcher/ThrowOnFirstElement.groovy b/javaagent-tooling/src/test/groovy/io/opentelemetry/auto/tooling/bytebuddy/matcher/ThrowOnFirstElement.groovy similarity index 100% rename from agent-tooling/src/test/groovy/io/opentelemetry/auto/tooling/bytebuddy/matcher/ThrowOnFirstElement.groovy rename to javaagent-tooling/src/test/groovy/io/opentelemetry/auto/tooling/bytebuddy/matcher/ThrowOnFirstElement.groovy diff --git a/agent-tooling/src/test/groovy/io/opentelemetry/auto/tooling/bytebuddy/matcher/testclasses/A.java b/javaagent-tooling/src/test/groovy/io/opentelemetry/auto/tooling/bytebuddy/matcher/testclasses/A.java similarity index 100% rename from agent-tooling/src/test/groovy/io/opentelemetry/auto/tooling/bytebuddy/matcher/testclasses/A.java rename to javaagent-tooling/src/test/groovy/io/opentelemetry/auto/tooling/bytebuddy/matcher/testclasses/A.java diff --git a/agent-tooling/src/test/groovy/io/opentelemetry/auto/tooling/bytebuddy/matcher/testclasses/B.java b/javaagent-tooling/src/test/groovy/io/opentelemetry/auto/tooling/bytebuddy/matcher/testclasses/B.java similarity index 100% rename from agent-tooling/src/test/groovy/io/opentelemetry/auto/tooling/bytebuddy/matcher/testclasses/B.java rename to javaagent-tooling/src/test/groovy/io/opentelemetry/auto/tooling/bytebuddy/matcher/testclasses/B.java diff --git a/agent-tooling/src/test/groovy/io/opentelemetry/auto/tooling/bytebuddy/matcher/testclasses/C.java b/javaagent-tooling/src/test/groovy/io/opentelemetry/auto/tooling/bytebuddy/matcher/testclasses/C.java similarity index 100% rename from agent-tooling/src/test/groovy/io/opentelemetry/auto/tooling/bytebuddy/matcher/testclasses/C.java rename to javaagent-tooling/src/test/groovy/io/opentelemetry/auto/tooling/bytebuddy/matcher/testclasses/C.java diff --git a/agent-tooling/src/test/groovy/io/opentelemetry/auto/tooling/bytebuddy/matcher/testclasses/D.java b/javaagent-tooling/src/test/groovy/io/opentelemetry/auto/tooling/bytebuddy/matcher/testclasses/D.java similarity index 100% rename from agent-tooling/src/test/groovy/io/opentelemetry/auto/tooling/bytebuddy/matcher/testclasses/D.java rename to javaagent-tooling/src/test/groovy/io/opentelemetry/auto/tooling/bytebuddy/matcher/testclasses/D.java diff --git a/agent-tooling/src/test/groovy/io/opentelemetry/auto/tooling/bytebuddy/matcher/testclasses/E.java b/javaagent-tooling/src/test/groovy/io/opentelemetry/auto/tooling/bytebuddy/matcher/testclasses/E.java similarity index 100% rename from agent-tooling/src/test/groovy/io/opentelemetry/auto/tooling/bytebuddy/matcher/testclasses/E.java rename to javaagent-tooling/src/test/groovy/io/opentelemetry/auto/tooling/bytebuddy/matcher/testclasses/E.java diff --git a/agent-tooling/src/test/groovy/io/opentelemetry/auto/tooling/bytebuddy/matcher/testclasses/F.java b/javaagent-tooling/src/test/groovy/io/opentelemetry/auto/tooling/bytebuddy/matcher/testclasses/F.java similarity index 100% rename from agent-tooling/src/test/groovy/io/opentelemetry/auto/tooling/bytebuddy/matcher/testclasses/F.java rename to javaagent-tooling/src/test/groovy/io/opentelemetry/auto/tooling/bytebuddy/matcher/testclasses/F.java diff --git a/agent-tooling/src/test/groovy/io/opentelemetry/auto/tooling/bytebuddy/matcher/testclasses/G.java b/javaagent-tooling/src/test/groovy/io/opentelemetry/auto/tooling/bytebuddy/matcher/testclasses/G.java similarity index 100% rename from agent-tooling/src/test/groovy/io/opentelemetry/auto/tooling/bytebuddy/matcher/testclasses/G.java rename to javaagent-tooling/src/test/groovy/io/opentelemetry/auto/tooling/bytebuddy/matcher/testclasses/G.java diff --git a/agent-tooling/src/test/groovy/io/opentelemetry/auto/tooling/bytebuddy/matcher/testclasses/Trace.java b/javaagent-tooling/src/test/groovy/io/opentelemetry/auto/tooling/bytebuddy/matcher/testclasses/Trace.java similarity index 100% rename from agent-tooling/src/test/groovy/io/opentelemetry/auto/tooling/bytebuddy/matcher/testclasses/Trace.java rename to javaagent-tooling/src/test/groovy/io/opentelemetry/auto/tooling/bytebuddy/matcher/testclasses/Trace.java diff --git a/agent-tooling/src/test/groovy/io/opentelemetry/auto/tooling/bytebuddy/matcher/testclasses/TracedClass.java b/javaagent-tooling/src/test/groovy/io/opentelemetry/auto/tooling/bytebuddy/matcher/testclasses/TracedClass.java similarity index 100% rename from agent-tooling/src/test/groovy/io/opentelemetry/auto/tooling/bytebuddy/matcher/testclasses/TracedClass.java rename to javaagent-tooling/src/test/groovy/io/opentelemetry/auto/tooling/bytebuddy/matcher/testclasses/TracedClass.java diff --git a/agent-tooling/src/test/groovy/io/opentelemetry/auto/tooling/bytebuddy/matcher/testclasses/UntracedClass.java b/javaagent-tooling/src/test/groovy/io/opentelemetry/auto/tooling/bytebuddy/matcher/testclasses/UntracedClass.java similarity index 100% rename from agent-tooling/src/test/groovy/io/opentelemetry/auto/tooling/bytebuddy/matcher/testclasses/UntracedClass.java rename to javaagent-tooling/src/test/groovy/io/opentelemetry/auto/tooling/bytebuddy/matcher/testclasses/UntracedClass.java diff --git a/agent-tooling/src/test/groovy/io/opentelemetry/auto/typed/TypedTracerDemonstration.java b/javaagent-tooling/src/test/groovy/io/opentelemetry/auto/typed/TypedTracerDemonstration.java similarity index 100% rename from agent-tooling/src/test/groovy/io/opentelemetry/auto/typed/TypedTracerDemonstration.java rename to javaagent-tooling/src/test/groovy/io/opentelemetry/auto/typed/TypedTracerDemonstration.java diff --git a/agent-tooling/src/test/groovy/io/opentelemetry/auto/typed/client/SampleHttpClientTypedSpan.java b/javaagent-tooling/src/test/groovy/io/opentelemetry/auto/typed/client/SampleHttpClientTypedSpan.java similarity index 100% rename from agent-tooling/src/test/groovy/io/opentelemetry/auto/typed/client/SampleHttpClientTypedSpan.java rename to javaagent-tooling/src/test/groovy/io/opentelemetry/auto/typed/client/SampleHttpClientTypedSpan.java diff --git a/agent-tooling/src/test/groovy/io/opentelemetry/auto/typed/client/SampleHttpClientTypedTracer.java b/javaagent-tooling/src/test/groovy/io/opentelemetry/auto/typed/client/SampleHttpClientTypedTracer.java similarity index 100% rename from agent-tooling/src/test/groovy/io/opentelemetry/auto/typed/client/SampleHttpClientTypedTracer.java rename to javaagent-tooling/src/test/groovy/io/opentelemetry/auto/typed/client/SampleHttpClientTypedTracer.java diff --git a/agent-tooling/src/test/groovy/io/opentelemetry/auto/typed/server/SampleHttpServerTypedSpan.java b/javaagent-tooling/src/test/groovy/io/opentelemetry/auto/typed/server/SampleHttpServerTypedSpan.java similarity index 100% rename from agent-tooling/src/test/groovy/io/opentelemetry/auto/typed/server/SampleHttpServerTypedSpan.java rename to javaagent-tooling/src/test/groovy/io/opentelemetry/auto/typed/server/SampleHttpServerTypedSpan.java diff --git a/agent-tooling/src/test/groovy/io/opentelemetry/auto/typed/server/SampleHttpServerTypedTracer.java b/javaagent-tooling/src/test/groovy/io/opentelemetry/auto/typed/server/SampleHttpServerTypedTracer.java similarity index 100% rename from agent-tooling/src/test/groovy/io/opentelemetry/auto/typed/server/SampleHttpServerTypedTracer.java rename to javaagent-tooling/src/test/groovy/io/opentelemetry/auto/typed/server/SampleHttpServerTypedTracer.java diff --git a/agent-tooling/src/test/java/io/opentelemetry/auto/test/BadAdvice.java b/javaagent-tooling/src/test/java/io/opentelemetry/auto/test/BadAdvice.java similarity index 100% rename from agent-tooling/src/test/java/io/opentelemetry/auto/test/BadAdvice.java rename to javaagent-tooling/src/test/java/io/opentelemetry/auto/test/BadAdvice.java diff --git a/agent-tooling/src/test/java/io/opentelemetry/auto/test/HelperClass.java b/javaagent-tooling/src/test/java/io/opentelemetry/auto/test/HelperClass.java similarity index 100% rename from agent-tooling/src/test/java/io/opentelemetry/auto/test/HelperClass.java rename to javaagent-tooling/src/test/java/io/opentelemetry/auto/test/HelperClass.java diff --git a/opentelemetry-javaagent/README.md b/javaagent/README.md similarity index 100% rename from opentelemetry-javaagent/README.md rename to javaagent/README.md diff --git a/opentelemetry-javaagent/opentelemetry-javaagent.gradle b/javaagent/javaagent.gradle similarity index 95% rename from opentelemetry-javaagent/opentelemetry-javaagent.gradle rename to javaagent/javaagent.gradle index e768e860cb..6c61c69a4c 100644 --- a/opentelemetry-javaagent/opentelemetry-javaagent.gradle +++ b/javaagent/javaagent.gradle @@ -4,7 +4,8 @@ plugins { id "com.github.johnrengelman.shadow" } -description = 'Auto instrumentation agent' +description = 'OpenTelemetry Javaagent' +group = 'io.opentelemetry.javaagent' apply from: "$rootDir/gradle/java.gradle" apply from: "$rootDir/gradle/version.gradle" @@ -94,7 +95,7 @@ tasks.withType(ShadowJar).configureEach { } dependencies { - testImplementation project(':auto-bootstrap') + testImplementation project(':javaagent-bootstrap') testImplementation project(':auto-api') testImplementation project(':library-api') testImplementation project(':utils:test-utils') @@ -104,7 +105,7 @@ dependencies { testImplementation 'io.opentracing.contrib.dropwizard:dropwizard-opentracing:0.2.2' - shadowInclude project(path: ':auto-bootstrap') + shadowInclude project(path: ':javaagent-bootstrap') } tasks.withType(Test).configureEach { diff --git a/opentelemetry-javaagent/src/main/java/io/opentelemetry/auto/bootstrap/AgentBootstrap.java b/javaagent/src/main/java/io/opentelemetry/auto/bootstrap/AgentBootstrap.java similarity index 100% rename from opentelemetry-javaagent/src/main/java/io/opentelemetry/auto/bootstrap/AgentBootstrap.java rename to javaagent/src/main/java/io/opentelemetry/auto/bootstrap/AgentBootstrap.java diff --git a/opentelemetry-javaagent/src/test/groovy/io/opentelemetry/auto/AgentLoadedIntoBootstrapTest.groovy b/javaagent/src/test/groovy/io/opentelemetry/auto/AgentLoadedIntoBootstrapTest.groovy similarity index 100% rename from opentelemetry-javaagent/src/test/groovy/io/opentelemetry/auto/AgentLoadedIntoBootstrapTest.groovy rename to javaagent/src/test/groovy/io/opentelemetry/auto/AgentLoadedIntoBootstrapTest.groovy diff --git a/opentelemetry-javaagent/src/test/groovy/io/opentelemetry/auto/LogLevelTest.groovy b/javaagent/src/test/groovy/io/opentelemetry/auto/LogLevelTest.groovy similarity index 100% rename from opentelemetry-javaagent/src/test/groovy/io/opentelemetry/auto/LogLevelTest.groovy rename to javaagent/src/test/groovy/io/opentelemetry/auto/LogLevelTest.groovy diff --git a/opentelemetry-javaagent/src/test/groovy/io/opentelemetry/auto/integration/classloading/ClassLoadingTest.groovy b/javaagent/src/test/groovy/io/opentelemetry/auto/integration/classloading/ClassLoadingTest.groovy similarity index 100% rename from opentelemetry-javaagent/src/test/groovy/io/opentelemetry/auto/integration/classloading/ClassLoadingTest.groovy rename to javaagent/src/test/groovy/io/opentelemetry/auto/integration/classloading/ClassLoadingTest.groovy diff --git a/opentelemetry-javaagent/src/test/groovy/io/opentelemetry/auto/integration/classloading/ShadowPackageRenamingTest.groovy b/javaagent/src/test/groovy/io/opentelemetry/auto/integration/classloading/ShadowPackageRenamingTest.groovy similarity index 100% rename from opentelemetry-javaagent/src/test/groovy/io/opentelemetry/auto/integration/classloading/ShadowPackageRenamingTest.groovy rename to javaagent/src/test/groovy/io/opentelemetry/auto/integration/classloading/ShadowPackageRenamingTest.groovy diff --git a/opentelemetry-javaagent/src/test/groovy/io/opentelemetry/auto/integration/muzzle/MuzzleBytecodeTransformTest.groovy b/javaagent/src/test/groovy/io/opentelemetry/auto/integration/muzzle/MuzzleBytecodeTransformTest.groovy similarity index 100% rename from opentelemetry-javaagent/src/test/groovy/io/opentelemetry/auto/integration/muzzle/MuzzleBytecodeTransformTest.groovy rename to javaagent/src/test/groovy/io/opentelemetry/auto/integration/muzzle/MuzzleBytecodeTransformTest.groovy diff --git a/opentelemetry-javaagent/src/test/java/io/opentelemetry/auto/test/IntegrationTestUtils.java b/javaagent/src/test/java/io/opentelemetry/auto/test/IntegrationTestUtils.java similarity index 100% rename from opentelemetry-javaagent/src/test/java/io/opentelemetry/auto/test/IntegrationTestUtils.java rename to javaagent/src/test/java/io/opentelemetry/auto/test/IntegrationTestUtils.java diff --git a/opentelemetry-javaagent/src/test/java/io/opentelemetry/test/ClassToInstrument.java b/javaagent/src/test/java/io/opentelemetry/test/ClassToInstrument.java similarity index 100% rename from opentelemetry-javaagent/src/test/java/io/opentelemetry/test/ClassToInstrument.java rename to javaagent/src/test/java/io/opentelemetry/test/ClassToInstrument.java diff --git a/opentelemetry-javaagent/src/test/java/io/opentelemetry/test/ClassToInstrumentChild.java b/javaagent/src/test/java/io/opentelemetry/test/ClassToInstrumentChild.java similarity index 100% rename from opentelemetry-javaagent/src/test/java/io/opentelemetry/test/ClassToInstrumentChild.java rename to javaagent/src/test/java/io/opentelemetry/test/ClassToInstrumentChild.java diff --git a/opentelemetry-javaagent/src/test/java/jvmbootstraptest/AgentLoadedChecker.java b/javaagent/src/test/java/jvmbootstraptest/AgentLoadedChecker.java similarity index 100% rename from opentelemetry-javaagent/src/test/java/jvmbootstraptest/AgentLoadedChecker.java rename to javaagent/src/test/java/jvmbootstraptest/AgentLoadedChecker.java diff --git a/opentelemetry-javaagent/src/test/java/jvmbootstraptest/LogLevelChecker.java b/javaagent/src/test/java/jvmbootstraptest/LogLevelChecker.java similarity index 100% rename from opentelemetry-javaagent/src/test/java/jvmbootstraptest/LogLevelChecker.java rename to javaagent/src/test/java/jvmbootstraptest/LogLevelChecker.java diff --git a/opentelemetry-javaagent/src/test/java/jvmbootstraptest/MyClassLoaderIsNotBootstrap.java b/javaagent/src/test/java/jvmbootstraptest/MyClassLoaderIsNotBootstrap.java similarity index 100% rename from opentelemetry-javaagent/src/test/java/jvmbootstraptest/MyClassLoaderIsNotBootstrap.java rename to javaagent/src/test/java/jvmbootstraptest/MyClassLoaderIsNotBootstrap.java diff --git a/opentelemetry-javaagent/src/test/resources/logback.xml b/javaagent/src/test/resources/logback.xml similarity index 100% rename from opentelemetry-javaagent/src/test/resources/logback.xml rename to javaagent/src/test/resources/logback.xml diff --git a/load-generator/load-generator.gradle b/load-generator/load-generator.gradle index 14a7934929..4a2f075fb1 100644 --- a/load-generator/load-generator.gradle +++ b/load-generator/load-generator.gradle @@ -1,18 +1,18 @@ apply from: "$rootDir/gradle/java.gradle" dependencies { - implementation project(':auto-bootstrap') + implementation project(':javaagent-bootstrap') implementation 'info.picocli:picocli:4.0.4' implementation deps.guava } task launch(type: JavaExec) { - dependsOn ':opentelemetry-javaagent:shadowJar' + dependsOn ':javaagent:shadowJar' doFirst { classpath = sourceSets.main.runtimeClasspath main = 'io.opentelemetry.loadgenerator.LoadGenerator' - jvmArgs = ["-javaagent:${project(':opentelemetry-javaagent').shadowJar.archivePath}"] + jvmArgs = ["-javaagent:${project(':javaagent').shadowJar.archivePath}"] systemProperties System.properties } } diff --git a/opentelemetry-sdk-shaded-for-testing/opentelemetry-sdk-shaded-for-testing.gradle b/opentelemetry-sdk-shaded-for-testing/opentelemetry-sdk-shaded-for-testing.gradle index 863c83d62b..146f7d0186 100644 --- a/opentelemetry-sdk-shaded-for-testing/opentelemetry-sdk-shaded-for-testing.gradle +++ b/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 auto-tooling-and-instrumentation.isolated and use that in tests, then wouldn't need to shade guava, etc +// build inst/ and use that in tests, then wouldn't need to shade guava, etc shadowJar { dependencies { diff --git a/settings.gradle b/settings.gradle index c653f1afdf..75793c5f87 100644 --- a/settings.gradle +++ b/settings.gradle @@ -19,13 +19,13 @@ gradleEnterprise { rootProject.name = 'opentelemetry-java-instrumentation' // agent projects -include ':opentelemetry-javaagent' include ':opentelemetry-sdk-shaded-for-testing' include ':opentelemetry-api-beta-shaded-for-instrumenting' include ':opentelemetry-auto-annotations-beta-shaded-for-instrumenting' include ':opentelemetry-sdk-beta-shaded-for-instrumenting' -include ':agent-bootstrap' -include ':agent-tooling' +include ':javaagent-bootstrap' +include ':javaagent-tooling' +include ':javaagent' include ':load-generator' include ':library-api' @@ -189,8 +189,6 @@ rootProject.children.each { setBuildFile(it) } -project(':agent-bootstrap').name = 'auto-bootstrap' -project(':agent-tooling').name = 'auto-tooling' project(':auto-exporters:jaeger').name = 'opentelemetry-auto-exporter-jaeger' project(':auto-exporters:logging').name = 'opentelemetry-auto-exporter-logging' project(':auto-exporters:otlp').name = 'opentelemetry-auto-exporter-otlp' diff --git a/smoke-tests/smoke-tests.gradle b/smoke-tests/smoke-tests.gradle index 62b2f2f10a..5cc1eb4a21 100644 --- a/smoke-tests/smoke-tests.gradle +++ b/smoke-tests/smoke-tests.gradle @@ -14,10 +14,10 @@ dependencies { } test { - dependsOn = [':opentelemetry-javaagent:shadowJar', ':auto-exporters:opentelemetry-auto-exporter-logging:shadowJar'] + dependsOn = [':javaagent:shadowJar', ':auto-exporters:opentelemetry-auto-exporter-logging:shadowJar'] doFirst { - jvmArgs "-Dio.opentelemetry.smoketest.agent.shadowJar.path=${project(':opentelemetry-javaagent').tasks.shadowJar.archivePath}" + jvmArgs "-Dio.opentelemetry.smoketest.agent.shadowJar.path=${project(':javaagent').tasks.shadowJar.archivePath}" jvmArgs "-Dotel.exporter.jar=${project(':auto-exporters:opentelemetry-auto-exporter-logging').tasks.shadowJar.archivePath}" } } \ No newline at end of file diff --git a/testing-common/testing-common.gradle b/testing-common/testing-common.gradle index 9f20d7f91b..2867dbd116 100644 --- a/testing-common/testing-common.gradle +++ b/testing-common/testing-common.gradle @@ -34,10 +34,10 @@ dependencies { //TODO replace with Servlet API? implementation group: 'org.eclipse.jetty', name: 'jetty-server', version: '8.0.0.v20110901' - implementation project(':auto-bootstrap') + implementation project(':javaagent-bootstrap') implementation project(':auto-api') implementation project(':library-api') - implementation(project(':auto-tooling')) { + implementation(project(':javaagent-tooling')) { // including :opentelemetry-sdk-shaded-for-testing above instead exclude group: 'io.opentelemetry', module: 'opentelemetry-sdk' }