From b2a8c95767bd21aacc5907afaf222dae544292c4 Mon Sep 17 00:00:00 2001 From: Nikita Salnikov-Tarnovski Date: Tue, 23 Jun 2020 18:08:55 +0300 Subject: [PATCH 1/6] Now publish all instrumentations as well. Changed groupId to `io.opentelemetry.instrumentation`. Removed `opentelemetry` from auto-exporters' artifactIds. Some instrumentations will need moving around to have better names, e.g. servlets. Should I do it right away? --- auto-exporters/auto-exporters.gradle | 32 +++++++++---------- build.gradle | 4 +-- gradle/instrumentation.gradle | 3 ++ gradle/publish.gradle | 12 +++++-- .../cdi-testing/cdi-testing.gradle | 1 + .../dropwizard-testing.gradle | 1 + .../jboss-testing/jboss-testing.gradle | 1 + .../osgi-testing/osgi-testing.gradle | 1 + .../tomcat-testing/tomcat-testing.gradle | 2 ++ .../akka-2.5-testing/akka-2.5-testing.gradle | 1 + .../akka-testing/akka-testing.gradle | 1 + .../kotlin-testing/kotlin-testing.gradle | 1 + .../scala-testing/scala-testing.gradle | 1 + .../glassfish-testing.gradle | 2 ++ java-agent/java-agent.gradle | 4 +-- settings.gradle | 8 ++--- smoke-tests/smoke-tests.gradle | 6 ++-- 17 files changed, 51 insertions(+), 30 deletions(-) diff --git a/auto-exporters/auto-exporters.gradle b/auto-exporters/auto-exporters.gradle index c4084d832d5f..dc704dc6adca 100644 --- a/auto-exporters/auto-exporters.gradle +++ b/auto-exporters/auto-exporters.gradle @@ -7,24 +7,24 @@ apply from: "$rootDir/gradle/java.gradle" dependencies { testCompile project(':auto-tooling') - testCompile project(':auto-exporters:opentelemetry-auto-exporter-otlp') - testCompile project(':auto-exporters:opentelemetry-auto-exporter-jaeger') - testCompile project(':auto-exporters:opentelemetry-auto-exporter-logging') - testCompile project(':auto-exporters:opentelemetry-auto-exporter-zipkin') + testCompile project(':auto-exporters:auto-exporter-otlp') + testCompile project(':auto-exporters:auto-exporter-jaeger') + testCompile project(':auto-exporters:auto-exporter-logging') + testCompile project(':auto-exporters: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' + dependsOn ':auto-exporters:auto-exporter-otlp:shadowJar' + dependsOn ':auto-exporters:auto-exporter-jaeger:shadowJar' + dependsOn ':auto-exporters:auto-exporter-logging:shadowJar' + dependsOn ':auto-exporters: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 + systemProperty 'otlpExporterJar', project(':auto-exporters:auto-exporter-otlp').tasks.shadowJar.archivePath + systemProperty 'jaegerExporterJar', project(':auto-exporters:auto-exporter-jaeger').tasks.shadowJar.archivePath + systemProperty 'loggingExporterJar', project(':auto-exporters:auto-exporter-logging').tasks.shadowJar.archivePath + systemProperty 'zipkinExporterJar', project(':auto-exporters:auto-exporter-zipkin').tasks.shadowJar.archivePath } } @@ -33,10 +33,10 @@ configurations { } 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:auto-exporter-logging', configuration: 'shadow') + shadowInclude project(path: ':auto-exporters:auto-exporter-otlp', configuration: 'shadow') + shadowInclude project(path: ':auto-exporters:auto-exporter-jaeger', configuration: 'shadow') + shadowInclude project(path: ':auto-exporters:auto-exporter-zipkin', configuration: 'shadow') } diff --git a/build.gradle b/build.gradle index e943ea427117..96369733e84b 100644 --- a/build.gradle +++ b/build.gradle @@ -26,7 +26,7 @@ release { def isCI = System.getenv("CI") != null allprojects { - group = 'io.opentelemetry.auto' + group = 'io.opentelemetry.instrumentation' if (isCI) { buildDir = "$rootDir/workspace/${projectDir.path.replace(rootDir.path, '')}/build/" @@ -42,7 +42,7 @@ repositories { mavenCentral() } -description = 'trace-java' +description = 'OpenTelemetry instrumentations for Java' wrapper { distributionType = Wrapper.DistributionType.ALL diff --git a/gradle/instrumentation.gradle b/gradle/instrumentation.gradle index bad2751a8c5b..679c400904e5 100644 --- a/gradle/instrumentation.gradle +++ b/gradle/instrumentation.gradle @@ -12,6 +12,9 @@ byteBuddy { } apply from: "$rootDir/gradle/java.gradle" +if (project.ext.find("skipPublish") != true) { + apply from: "$rootDir/gradle/publish.gradle" +} tasks.withType(Test) { forkEvery = 1 diff --git a/gradle/publish.gradle b/gradle/publish.gradle index ef45b3ff037f..fe88085bc36c 100644 --- a/gradle/publish.gradle +++ b/gradle/publish.gradle @@ -10,9 +10,15 @@ publishing { } publications { maven(MavenPublication) { - artifact javadocJar - artifact sourcesJar - artifact shadowJar + if (project.tasks.findByName("shadowJar") != null) { + project.shadow.component(it) + //These two are here just to satisfy Maven Central + artifact sourcesJar + artifact javadocJar + } else { + from components.java + } + pom { name = 'OpenTelemetry Instrumentation for Java' diff --git a/instrumentation/cdi-testing/cdi-testing.gradle b/instrumentation/cdi-testing/cdi-testing.gradle index 52d9802cfd23..0498adec0fe7 100644 --- a/instrumentation/cdi-testing/cdi-testing.gradle +++ b/instrumentation/cdi-testing/cdi-testing.gradle @@ -1,3 +1,4 @@ +ext.skipPublish = true apply from: "$rootDir/gradle/instrumentation.gradle" apply plugin: 'org.unbroken-dome.test-sets' diff --git a/instrumentation/dropwizard-testing/dropwizard-testing.gradle b/instrumentation/dropwizard-testing/dropwizard-testing.gradle index 81206b6957ed..88f643fc3c37 100644 --- a/instrumentation/dropwizard-testing/dropwizard-testing.gradle +++ b/instrumentation/dropwizard-testing/dropwizard-testing.gradle @@ -1,3 +1,4 @@ +ext.skipPublish = true apply from: "$rootDir/gradle/instrumentation.gradle" //apply plugin: 'org.unbroken-dome.test-sets' diff --git a/instrumentation/java-class-loader/jboss-testing/jboss-testing.gradle b/instrumentation/java-class-loader/jboss-testing/jboss-testing.gradle index 74ebe33832b9..1b706e2b3447 100644 --- a/instrumentation/java-class-loader/jboss-testing/jboss-testing.gradle +++ b/instrumentation/java-class-loader/jboss-testing/jboss-testing.gradle @@ -1,3 +1,4 @@ +ext.skipPublish = true apply from: "$rootDir/gradle/instrumentation.gradle" dependencies { diff --git a/instrumentation/java-class-loader/osgi-testing/osgi-testing.gradle b/instrumentation/java-class-loader/osgi-testing/osgi-testing.gradle index 4a030c77b31f..560a81b6bc51 100644 --- a/instrumentation/java-class-loader/osgi-testing/osgi-testing.gradle +++ b/instrumentation/java-class-loader/osgi-testing/osgi-testing.gradle @@ -1,3 +1,4 @@ +ext.skipPublish = true apply from: "$rootDir/gradle/instrumentation.gradle" dependencies { diff --git a/instrumentation/java-class-loader/tomcat-testing/tomcat-testing.gradle b/instrumentation/java-class-loader/tomcat-testing/tomcat-testing.gradle index 70030f437e80..82ce1dc3f871 100644 --- a/instrumentation/java-class-loader/tomcat-testing/tomcat-testing.gradle +++ b/instrumentation/java-class-loader/tomcat-testing/tomcat-testing.gradle @@ -1,3 +1,5 @@ +ext.skipPublish = true + apply from: "$rootDir/gradle/instrumentation.gradle" apply plugin: 'org.unbroken-dome.test-sets' diff --git a/instrumentation/java-concurrent/akka-2.5-testing/akka-2.5-testing.gradle b/instrumentation/java-concurrent/akka-2.5-testing/akka-2.5-testing.gradle index d8ffa4b63b72..6c5bd0941be8 100644 --- a/instrumentation/java-concurrent/akka-2.5-testing/akka-2.5-testing.gradle +++ b/instrumentation/java-concurrent/akka-2.5-testing/akka-2.5-testing.gradle @@ -1,6 +1,7 @@ // Set properties before any plugins get loaded ext { minJavaVersionForTests = JavaVersion.VERSION_1_8 + skipPublish = true } apply from: "$rootDir/gradle/instrumentation.gradle" diff --git a/instrumentation/java-concurrent/akka-testing/akka-testing.gradle b/instrumentation/java-concurrent/akka-testing/akka-testing.gradle index cc8f5a953744..04c2e98a05ca 100644 --- a/instrumentation/java-concurrent/akka-testing/akka-testing.gradle +++ b/instrumentation/java-concurrent/akka-testing/akka-testing.gradle @@ -1,3 +1,4 @@ +ext.skipPublish = true apply from: "$rootDir/gradle/instrumentation.gradle" apply from: "$rootDir/gradle/test-with-scala.gradle" diff --git a/instrumentation/java-concurrent/kotlin-testing/kotlin-testing.gradle b/instrumentation/java-concurrent/kotlin-testing/kotlin-testing.gradle index b9795a675cbf..55042543536e 100644 --- a/instrumentation/java-concurrent/kotlin-testing/kotlin-testing.gradle +++ b/instrumentation/java-concurrent/kotlin-testing/kotlin-testing.gradle @@ -1,3 +1,4 @@ +ext.skipPublish = true apply from: "$rootDir/gradle/instrumentation.gradle" apply from: "$rootDir/gradle/test-with-kotlin.gradle" diff --git a/instrumentation/java-concurrent/scala-testing/scala-testing.gradle b/instrumentation/java-concurrent/scala-testing/scala-testing.gradle index 634c41f6dece..b2454b1fbef8 100644 --- a/instrumentation/java-concurrent/scala-testing/scala-testing.gradle +++ b/instrumentation/java-concurrent/scala-testing/scala-testing.gradle @@ -1,3 +1,4 @@ +ext.skipPublish = true apply from: "$rootDir/gradle/instrumentation.gradle" apply from: "$rootDir/gradle/test-with-scala.gradle" diff --git a/instrumentation/servlet/glassfish-testing/glassfish-testing.gradle b/instrumentation/servlet/glassfish-testing/glassfish-testing.gradle index 28f42af7ec88..ebcb604d3252 100644 --- a/instrumentation/servlet/glassfish-testing/glassfish-testing.gradle +++ b/instrumentation/servlet/glassfish-testing/glassfish-testing.gradle @@ -1,10 +1,12 @@ ext { maxJavaVersionForTests = JavaVersion.VERSION_1_8 + skipPublish = true } apply from: "$rootDir/gradle/instrumentation.gradle" apply plugin: 'org.unbroken-dome.test-sets' + testSets { latestDepTest { dirName = 'test' diff --git a/java-agent/java-agent.gradle b/java-agent/java-agent.gradle index 4e4d6c250fc7..4c313bba09cf 100644 --- a/java-agent/java-agent.gradle +++ b/java-agent/java-agent.gradle @@ -4,7 +4,7 @@ plugins { id "com.github.johnrengelman.shadow" } -description = 'opentelemetry-auto' +description = 'Auto instrumentation agent' apply from: "$rootDir/gradle/java.gradle" apply from: "$rootDir/gradle/version.gradle" @@ -46,7 +46,6 @@ shadowJar { //Includes instrumentations, but not exporters task lightShadow(type: ShadowJar) { - archiveClassifier = '' from sourceSets.main.output def sourceTasks = [project(':instrumentation').tasks.shadowJar] @@ -61,6 +60,7 @@ publishing { } } } + tasks.withType(ShadowJar).configureEach { configurations = [project.configurations.shadowInclude] mergeServiceFiles() diff --git a/settings.gradle b/settings.gradle index ecd18663854d..24a7cc701638 100644 --- a/settings.gradle +++ b/settings.gradle @@ -179,7 +179,7 @@ rootProject.children.each { project(':agent-bootstrap').name = 'auto-bootstrap' project(':agent-tooling').name = 'auto-tooling' project(':java-agent').name = 'opentelemetry-auto' -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' -project(':auto-exporters:zipkin').name = 'opentelemetry-auto-exporter-zipkin' +project(':auto-exporters:jaeger').name = 'auto-exporter-jaeger' +project(':auto-exporters:logging').name = 'auto-exporter-logging' +project(':auto-exporters:otlp').name = 'auto-exporter-otlp' +project(':auto-exporters:zipkin').name = 'auto-exporter-zipkin' diff --git a/smoke-tests/smoke-tests.gradle b/smoke-tests/smoke-tests.gradle index 486c2335f244..614bbd08e1fd 100644 --- a/smoke-tests/smoke-tests.gradle +++ b/smoke-tests/smoke-tests.gradle @@ -5,18 +5,18 @@ description = 'smoke-tests' dependencies { compile deps.spock compile project(':testing') - compile project(':auto-exporters:opentelemetry-auto-exporter-logging') + compile project(':auto-exporters:auto-exporter-logging') } subprojects { subProject -> subProject.tasks.withType(Test).configureEach { - dependsOn = [':opentelemetry-auto:shadowJar', ':auto-exporters:opentelemetry-auto-exporter-logging:shadowJar'] + dependsOn = [':opentelemetry-auto:shadowJar', ':auto-exporters:auto-exporter-logging:shadowJar'] doFirst { // Tests depend on this to know where to run things and what agent jar to use jvmArgs "-Dio.opentelemetry.smoketest.builddir=${buildDir}" jvmArgs "-Dio.opentelemetry.smoketest.agent.shadowJar.path=${project(':opentelemetry-auto').tasks.shadowJar.archivePath}" - jvmArgs "-Dota.exporter.jar=${project(':auto-exporters:opentelemetry-auto-exporter-logging').tasks.shadowJar.archivePath}" + jvmArgs "-Dota.exporter.jar=${project(':auto-exporters:auto-exporter-logging').tasks.shadowJar.archivePath}" } } } From 49e5faad91e49cd8bab519893fb58d683949ea82 Mon Sep 17 00:00:00 2001 From: Nikita Salnikov-Tarnovski Date: Wed, 24 Jun 2020 08:43:25 +0300 Subject: [PATCH 2/6] Polish --- auto-exporters/auto-exporters.gradle | 32 ++++++++++++++-------------- build.gradle | 2 +- settings.gradle | 10 ++++----- smoke-tests/smoke-tests.gradle | 6 +++--- 4 files changed, 25 insertions(+), 25 deletions(-) diff --git a/auto-exporters/auto-exporters.gradle b/auto-exporters/auto-exporters.gradle index dc704dc6adca..c4084d832d5f 100644 --- a/auto-exporters/auto-exporters.gradle +++ b/auto-exporters/auto-exporters.gradle @@ -7,24 +7,24 @@ apply from: "$rootDir/gradle/java.gradle" dependencies { testCompile project(':auto-tooling') - testCompile project(':auto-exporters:auto-exporter-otlp') - testCompile project(':auto-exporters:auto-exporter-jaeger') - testCompile project(':auto-exporters:auto-exporter-logging') - testCompile project(':auto-exporters:auto-exporter-zipkin') + testCompile project(':auto-exporters:opentelemetry-auto-exporter-otlp') + testCompile project(':auto-exporters:opentelemetry-auto-exporter-jaeger') + testCompile project(':auto-exporters:opentelemetry-auto-exporter-logging') + testCompile project(':auto-exporters:opentelemetry-auto-exporter-zipkin') } tasks.withType(Test).configureEach() { - dependsOn ':auto-exporters:auto-exporter-otlp:shadowJar' - dependsOn ':auto-exporters:auto-exporter-jaeger:shadowJar' - dependsOn ':auto-exporters:auto-exporter-logging:shadowJar' - dependsOn ':auto-exporters:auto-exporter-zipkin:shadowJar' + 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:auto-exporter-otlp').tasks.shadowJar.archivePath - systemProperty 'jaegerExporterJar', project(':auto-exporters:auto-exporter-jaeger').tasks.shadowJar.archivePath - systemProperty 'loggingExporterJar', project(':auto-exporters:auto-exporter-logging').tasks.shadowJar.archivePath - systemProperty 'zipkinExporterJar', project(':auto-exporters:auto-exporter-zipkin').tasks.shadowJar.archivePath + 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 } } @@ -33,10 +33,10 @@ configurations { } dependencies { - shadowInclude project(path: ':auto-exporters:auto-exporter-logging', configuration: 'shadow') - shadowInclude project(path: ':auto-exporters:auto-exporter-otlp', configuration: 'shadow') - shadowInclude project(path: ':auto-exporters:auto-exporter-jaeger', configuration: 'shadow') - shadowInclude project(path: ':auto-exporters: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') } diff --git a/build.gradle b/build.gradle index 96369733e84b..c330d27cf074 100644 --- a/build.gradle +++ b/build.gradle @@ -26,7 +26,7 @@ release { def isCI = System.getenv("CI") != null allprojects { - group = 'io.opentelemetry.instrumentation' + group = 'io.opentelemetry.instrumentation.auto' if (isCI) { buildDir = "$rootDir/workspace/${projectDir.path.replace(rootDir.path, '')}/build/" diff --git a/settings.gradle b/settings.gradle index 24a7cc701638..68bf61a8a15b 100644 --- a/settings.gradle +++ b/settings.gradle @@ -178,8 +178,8 @@ rootProject.children.each { project(':agent-bootstrap').name = 'auto-bootstrap' project(':agent-tooling').name = 'auto-tooling' -project(':java-agent').name = 'opentelemetry-auto' -project(':auto-exporters:jaeger').name = 'auto-exporter-jaeger' -project(':auto-exporters:logging').name = 'auto-exporter-logging' -project(':auto-exporters:otlp').name = 'auto-exporter-otlp' -project(':auto-exporters:zipkin').name = 'auto-exporter-zipkin' +project(':java-agent').name = 'opentelemetry-agent' +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' +project(':auto-exporters:zipkin').name = 'opentelemetry-auto-exporter-zipkin' diff --git a/smoke-tests/smoke-tests.gradle b/smoke-tests/smoke-tests.gradle index 614bbd08e1fd..486c2335f244 100644 --- a/smoke-tests/smoke-tests.gradle +++ b/smoke-tests/smoke-tests.gradle @@ -5,18 +5,18 @@ description = 'smoke-tests' dependencies { compile deps.spock compile project(':testing') - compile project(':auto-exporters:auto-exporter-logging') + compile project(':auto-exporters:opentelemetry-auto-exporter-logging') } subprojects { subProject -> subProject.tasks.withType(Test).configureEach { - dependsOn = [':opentelemetry-auto:shadowJar', ':auto-exporters:auto-exporter-logging:shadowJar'] + dependsOn = [':opentelemetry-auto:shadowJar', ':auto-exporters:opentelemetry-auto-exporter-logging:shadowJar'] doFirst { // Tests depend on this to know where to run things and what agent jar to use jvmArgs "-Dio.opentelemetry.smoketest.builddir=${buildDir}" jvmArgs "-Dio.opentelemetry.smoketest.agent.shadowJar.path=${project(':opentelemetry-auto').tasks.shadowJar.archivePath}" - jvmArgs "-Dota.exporter.jar=${project(':auto-exporters:auto-exporter-logging').tasks.shadowJar.archivePath}" + jvmArgs "-Dota.exporter.jar=${project(':auto-exporters:opentelemetry-auto-exporter-logging').tasks.shadowJar.archivePath}" } } } From 1791197a3341a2b72b502ae34c0ca7de9932c680 Mon Sep 17 00:00:00 2001 From: Nikita Salnikov-Tarnovski Date: Fri, 26 Jun 2020 18:30:21 +0300 Subject: [PATCH 3/6] Unify names of published artifacts --- gradle/publish.gradle | 11 +++++++++++ .../aws-sdk/aws-sdk-2.2-core/aws-sdk-2.2-core.gradle | 3 +++ {java-agent => opentelemetry-javaagent}/README.md | 0 .../opentelemetry-javaagent.gradle | 0 .../opentelemetry/auto/bootstrap/AgentBootstrap.java | 0 .../auto/AgentLoadedIntoBootstrapTest.groovy | 0 .../groovy/io/opentelemetry/auto/LogLevelTest.groovy | 0 .../integration/classloading/ClassLoadingTest.groovy | 0 .../classloading/ShadowPackageRenamingTest.groovy | 0 .../muzzle/MuzzleBytecodeTransformTest.groovy | 0 .../opentelemetry/auto/test/IntegrationTestUtils.java | 0 .../java/io/opentelemetry/test/ClassToInstrument.java | 0 .../io/opentelemetry/test/ClassToInstrumentChild.java | 0 .../java/jvmbootstraptest/AgentLoadedChecker.java | 0 .../test/java/jvmbootstraptest/LogLevelChecker.java | 0 .../src/test/resources/logback.xml | 0 settings.gradle | 3 +-- 17 files changed, 15 insertions(+), 2 deletions(-) rename {java-agent => opentelemetry-javaagent}/README.md (100%) rename java-agent/java-agent.gradle => opentelemetry-javaagent/opentelemetry-javaagent.gradle (100%) rename {java-agent => opentelemetry-javaagent}/src/main/java/io/opentelemetry/auto/bootstrap/AgentBootstrap.java (100%) rename {java-agent => opentelemetry-javaagent}/src/test/groovy/io/opentelemetry/auto/AgentLoadedIntoBootstrapTest.groovy (100%) rename {java-agent => opentelemetry-javaagent}/src/test/groovy/io/opentelemetry/auto/LogLevelTest.groovy (100%) rename {java-agent => opentelemetry-javaagent}/src/test/groovy/io/opentelemetry/auto/integration/classloading/ClassLoadingTest.groovy (100%) rename {java-agent => opentelemetry-javaagent}/src/test/groovy/io/opentelemetry/auto/integration/classloading/ShadowPackageRenamingTest.groovy (100%) rename {java-agent => opentelemetry-javaagent}/src/test/groovy/io/opentelemetry/auto/integration/muzzle/MuzzleBytecodeTransformTest.groovy (100%) rename {java-agent => opentelemetry-javaagent}/src/test/java/io/opentelemetry/auto/test/IntegrationTestUtils.java (100%) rename {java-agent => opentelemetry-javaagent}/src/test/java/io/opentelemetry/test/ClassToInstrument.java (100%) rename {java-agent => opentelemetry-javaagent}/src/test/java/io/opentelemetry/test/ClassToInstrumentChild.java (100%) rename {java-agent => opentelemetry-javaagent}/src/test/java/jvmbootstraptest/AgentLoadedChecker.java (100%) rename {java-agent => opentelemetry-javaagent}/src/test/java/jvmbootstraptest/LogLevelChecker.java (100%) rename {java-agent => opentelemetry-javaagent}/src/test/resources/logback.xml (100%) diff --git a/gradle/publish.gradle b/gradle/publish.gradle index fe88085bc36c..0124a5a5b161 100644 --- a/gradle/publish.gradle +++ b/gradle/publish.gradle @@ -19,6 +19,7 @@ publishing { from components.java } + artifactId = artifactPrefix(project) + artifactId pom { name = 'OpenTelemetry Instrumentation for Java' @@ -56,6 +57,16 @@ publishing { } } +private String artifactPrefix(Project p){ + if(p.name.startsWith("opentelemetry")){ + return '' + } + if(p.group == 'io.opentelemetry.instrumentation.auto'){ + return 'opentelemetry-auto-' + } + return 'opentelemetry-' +} + bintray { user = System.getenv('BINTRAY_USER') key = System.getenv('BINTRAY_API_KEY') diff --git a/instrumentation-core/aws-sdk/aws-sdk-2.2-core/aws-sdk-2.2-core.gradle b/instrumentation-core/aws-sdk/aws-sdk-2.2-core/aws-sdk-2.2-core.gradle index f200df2e1117..5bdd797c4b67 100644 --- a/instrumentation-core/aws-sdk/aws-sdk-2.2-core/aws-sdk-2.2-core.gradle +++ b/instrumentation-core/aws-sdk/aws-sdk-2.2-core/aws-sdk-2.2-core.gradle @@ -2,7 +2,10 @@ ext { minJavaVersionForTests = JavaVersion.VERSION_1_8 } +group = 'io.opentelemetry.instrumentation' + apply from: "$rootDir/gradle/java.gradle" +apply from: "$rootDir/gradle/publish.gradle" apply plugin: 'org.unbroken-dome.test-sets' testSets { diff --git a/java-agent/README.md b/opentelemetry-javaagent/README.md similarity index 100% rename from java-agent/README.md rename to opentelemetry-javaagent/README.md diff --git a/java-agent/java-agent.gradle b/opentelemetry-javaagent/opentelemetry-javaagent.gradle similarity index 100% rename from java-agent/java-agent.gradle rename to opentelemetry-javaagent/opentelemetry-javaagent.gradle diff --git a/java-agent/src/main/java/io/opentelemetry/auto/bootstrap/AgentBootstrap.java b/opentelemetry-javaagent/src/main/java/io/opentelemetry/auto/bootstrap/AgentBootstrap.java similarity index 100% rename from java-agent/src/main/java/io/opentelemetry/auto/bootstrap/AgentBootstrap.java rename to opentelemetry-javaagent/src/main/java/io/opentelemetry/auto/bootstrap/AgentBootstrap.java diff --git a/java-agent/src/test/groovy/io/opentelemetry/auto/AgentLoadedIntoBootstrapTest.groovy b/opentelemetry-javaagent/src/test/groovy/io/opentelemetry/auto/AgentLoadedIntoBootstrapTest.groovy similarity index 100% rename from java-agent/src/test/groovy/io/opentelemetry/auto/AgentLoadedIntoBootstrapTest.groovy rename to opentelemetry-javaagent/src/test/groovy/io/opentelemetry/auto/AgentLoadedIntoBootstrapTest.groovy diff --git a/java-agent/src/test/groovy/io/opentelemetry/auto/LogLevelTest.groovy b/opentelemetry-javaagent/src/test/groovy/io/opentelemetry/auto/LogLevelTest.groovy similarity index 100% rename from java-agent/src/test/groovy/io/opentelemetry/auto/LogLevelTest.groovy rename to opentelemetry-javaagent/src/test/groovy/io/opentelemetry/auto/LogLevelTest.groovy diff --git a/java-agent/src/test/groovy/io/opentelemetry/auto/integration/classloading/ClassLoadingTest.groovy b/opentelemetry-javaagent/src/test/groovy/io/opentelemetry/auto/integration/classloading/ClassLoadingTest.groovy similarity index 100% rename from java-agent/src/test/groovy/io/opentelemetry/auto/integration/classloading/ClassLoadingTest.groovy rename to opentelemetry-javaagent/src/test/groovy/io/opentelemetry/auto/integration/classloading/ClassLoadingTest.groovy diff --git a/java-agent/src/test/groovy/io/opentelemetry/auto/integration/classloading/ShadowPackageRenamingTest.groovy b/opentelemetry-javaagent/src/test/groovy/io/opentelemetry/auto/integration/classloading/ShadowPackageRenamingTest.groovy similarity index 100% rename from java-agent/src/test/groovy/io/opentelemetry/auto/integration/classloading/ShadowPackageRenamingTest.groovy rename to opentelemetry-javaagent/src/test/groovy/io/opentelemetry/auto/integration/classloading/ShadowPackageRenamingTest.groovy diff --git a/java-agent/src/test/groovy/io/opentelemetry/auto/integration/muzzle/MuzzleBytecodeTransformTest.groovy b/opentelemetry-javaagent/src/test/groovy/io/opentelemetry/auto/integration/muzzle/MuzzleBytecodeTransformTest.groovy similarity index 100% rename from java-agent/src/test/groovy/io/opentelemetry/auto/integration/muzzle/MuzzleBytecodeTransformTest.groovy rename to opentelemetry-javaagent/src/test/groovy/io/opentelemetry/auto/integration/muzzle/MuzzleBytecodeTransformTest.groovy diff --git a/java-agent/src/test/java/io/opentelemetry/auto/test/IntegrationTestUtils.java b/opentelemetry-javaagent/src/test/java/io/opentelemetry/auto/test/IntegrationTestUtils.java similarity index 100% rename from java-agent/src/test/java/io/opentelemetry/auto/test/IntegrationTestUtils.java rename to opentelemetry-javaagent/src/test/java/io/opentelemetry/auto/test/IntegrationTestUtils.java diff --git a/java-agent/src/test/java/io/opentelemetry/test/ClassToInstrument.java b/opentelemetry-javaagent/src/test/java/io/opentelemetry/test/ClassToInstrument.java similarity index 100% rename from java-agent/src/test/java/io/opentelemetry/test/ClassToInstrument.java rename to opentelemetry-javaagent/src/test/java/io/opentelemetry/test/ClassToInstrument.java diff --git a/java-agent/src/test/java/io/opentelemetry/test/ClassToInstrumentChild.java b/opentelemetry-javaagent/src/test/java/io/opentelemetry/test/ClassToInstrumentChild.java similarity index 100% rename from java-agent/src/test/java/io/opentelemetry/test/ClassToInstrumentChild.java rename to opentelemetry-javaagent/src/test/java/io/opentelemetry/test/ClassToInstrumentChild.java diff --git a/java-agent/src/test/java/jvmbootstraptest/AgentLoadedChecker.java b/opentelemetry-javaagent/src/test/java/jvmbootstraptest/AgentLoadedChecker.java similarity index 100% rename from java-agent/src/test/java/jvmbootstraptest/AgentLoadedChecker.java rename to opentelemetry-javaagent/src/test/java/jvmbootstraptest/AgentLoadedChecker.java diff --git a/java-agent/src/test/java/jvmbootstraptest/LogLevelChecker.java b/opentelemetry-javaagent/src/test/java/jvmbootstraptest/LogLevelChecker.java similarity index 100% rename from java-agent/src/test/java/jvmbootstraptest/LogLevelChecker.java rename to opentelemetry-javaagent/src/test/java/jvmbootstraptest/LogLevelChecker.java diff --git a/java-agent/src/test/resources/logback.xml b/opentelemetry-javaagent/src/test/resources/logback.xml similarity index 100% rename from java-agent/src/test/resources/logback.xml rename to opentelemetry-javaagent/src/test/resources/logback.xml diff --git a/settings.gradle b/settings.gradle index 68bf61a8a15b..9ed25f1f7406 100644 --- a/settings.gradle +++ b/settings.gradle @@ -19,7 +19,7 @@ gradleEnterprise { rootProject.name = 'opentelemetry-java-instrumentation' // agent projects -include ':java-agent' +include ':opentelemetry-javaagent' include ':opentelemetry-sdk-shaded-for-testing' include ':opentelemetry-api-shaded-for-instrumenting' include ':logback-shaded-for-instrumenting' @@ -178,7 +178,6 @@ rootProject.children.each { project(':agent-bootstrap').name = 'auto-bootstrap' project(':agent-tooling').name = 'auto-tooling' -project(':java-agent').name = 'opentelemetry-agent' 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' From 43902805cc1dfc7dc2deda630854210997005683 Mon Sep 17 00:00:00 2001 From: Nikita Salnikov-Tarnovski Date: Fri, 26 Jun 2020 19:34:20 +0300 Subject: [PATCH 4/6] Renamed some modules --- benchmark/benchmark.gradle | 2 +- gradle/instrumentation.gradle | 2 +- gradle/java.gradle | 2 +- .../dropwizard-testing.gradle | 2 +- .../java-classloader.gradle} | 0 .../jboss-testing/jboss-testing.gradle | 2 +- .../test/groovy/JBossClassloadingTest.groovy | 0 .../osgi-testing/osgi-testing.gradle | 2 +- .../test/groovy/OSGIClassloadingTest.groovy | 0 .../ClassLoaderInstrumentation.java | 0 .../src/test/groovy/ClassLoadingTest.groovy | 0 .../test/groovy/TomcatClassloadingTest.groovy | 0 .../tomcat-testing/tomcat-testing.gradle | 2 +- .../jaxrs/jaxrs-2.0/jaxrs-2.0.gradle | 2 +- instrumentation/jsp-2.3/jsp-2.3.gradle | 2 +- .../lettuce/lettuce-5.0/lettuce-5.0.gradle | 2 +- .../lettuce/lettuce-5.1/lettuce-5.1.gradle | 2 +- .../project-reactor-3.1.gradle} | 0 .../reactor/ReactorHooksInstrumentation.java | 0 .../reactor/FluxAndMonoSubscribeAdvice.java | 0 .../reactor/ReactorCoreAdviceUtils.java | 0 .../reactor/ReactorHooksAdvice.java | 0 .../reactor/TracingPublishers.java | 0 .../reactor/TracingSubscriber.java | 0 .../src/test/groovy/ReactorCoreTest.groovy | 0 .../rabbitmq-2.7.gradle} | 0 .../amqp/RabbitChannelInstrumentation.java | 0 .../amqp/RabbitCommandInstrumentation.java | 0 .../rabbitmq/amqp/RabbitDecorator.java | 0 .../rabbitmq/amqp/TextMapExtractAdapter.java | 0 .../rabbitmq/amqp/TextMapInjectAdapter.java | 0 .../amqp/TracedDelegatingConsumer.java | 0 .../src/test/groovy/RabbitMQTest.groovy | 0 .../glassfish-testing/glassfish-testing.gradle | 2 +- .../servlet-2.3.gradle} | 0 .../servlet/v2_3/Servlet2Advice.java | 0 .../servlet/v2_3/Servlet2HttpServerTracer.java | 0 .../servlet/v2_3/Servlet2Instrumentation.java | 0 .../Servlet2ResponseStatusInstrumentation.java | 0 .../src/test/groovy/JettyServlet2Test.groovy | 0 .../groovy/ServletTestInstrumentation.java | 0 .../src/test/groovy/TestServlet2.groovy | 0 .../src/test/resources/realm.properties | 0 .../servlet-3.0.gradle} | 0 .../v3_0/AsyncContextInstrumentation.java | 0 .../servlet/v3_0/Servlet3Advice.java | 0 .../servlet/v3_0/Servlet3HttpServerTracer.java | 0 .../servlet/v3_0/Servlet3Instrumentation.java | 0 .../servlet/v3_0/TagSettingAsyncListener.java | 0 .../test/groovy/AbstractServlet3Test.groovy | 0 .../src/test/groovy/JettyServlet3Test.groovy | 0 .../test/groovy/JettyServletHandlerTest.groovy | 0 .../test/groovy/RequestDispatcherServlet.java | 0 .../groovy/ServletTestInstrumentation.java | 0 .../src/test/groovy/TestServlet3.groovy | 0 .../src/test/groovy/TomcatServlet3Test.groovy | 0 .../src/test/resources/realm.properties | 0 instrumentation/servlet/servlet.gradle | 2 +- .../spark-web-framework-2.3.gradle} | 0 .../sparkjava/RoutesInstrumentation.java | 0 .../src/test/groovy/SparkJavaBasedTest.groovy | 0 .../test/java/TestSparkJavaApplication.java | 0 .../spring-webflux-5.0.gradle | 2 +- .../spring-webmvc-3.1/spring-webmvc-3.1.gradle | 2 +- load-generator/load-generator.gradle | 4 ++-- .../auto/bootstrap/AgentBootstrap.java | 2 +- settings.gradle | 18 +++++++++--------- smoke-tests/smoke-tests.gradle | 4 ++-- 68 files changed, 29 insertions(+), 29 deletions(-) rename instrumentation/{java-class-loader/java-class-loader.gradle => java-classloader/java-classloader.gradle} (100%) rename instrumentation/{java-class-loader => java-classloader}/jboss-testing/jboss-testing.gradle (75%) rename instrumentation/{java-class-loader => java-classloader}/jboss-testing/src/test/groovy/JBossClassloadingTest.groovy (100%) rename instrumentation/{java-class-loader => java-classloader}/osgi-testing/osgi-testing.gradle (90%) rename instrumentation/{java-class-loader => java-classloader}/osgi-testing/src/test/groovy/OSGIClassloadingTest.groovy (100%) rename instrumentation/{java-class-loader => java-classloader}/src/main/java/io/opentelemetry/auto/instrumentation/javaclassloader/ClassLoaderInstrumentation.java (100%) rename instrumentation/{java-class-loader => java-classloader}/src/test/groovy/ClassLoadingTest.groovy (100%) rename instrumentation/{java-class-loader => java-classloader}/tomcat-testing/src/test/groovy/TomcatClassloadingTest.groovy (100%) rename instrumentation/{java-class-loader => java-classloader}/tomcat-testing/tomcat-testing.gradle (91%) rename instrumentation/{reactor-3.1/reactor-3.1.gradle => project-reactor-3.1/project-reactor-3.1.gradle} (100%) rename instrumentation/{reactor-3.1 => project-reactor-3.1}/src/main/java/io/opentelemetry/auto/instrumentation/reactor/ReactorHooksInstrumentation.java (100%) rename instrumentation/{reactor-3.1 => project-reactor-3.1}/src/main/java8/io/opentelemetry/auto/instrumentation/reactor/FluxAndMonoSubscribeAdvice.java (100%) rename instrumentation/{reactor-3.1 => project-reactor-3.1}/src/main/java8/io/opentelemetry/auto/instrumentation/reactor/ReactorCoreAdviceUtils.java (100%) rename instrumentation/{reactor-3.1 => project-reactor-3.1}/src/main/java8/io/opentelemetry/auto/instrumentation/reactor/ReactorHooksAdvice.java (100%) rename instrumentation/{reactor-3.1 => project-reactor-3.1}/src/main/java8/io/opentelemetry/auto/instrumentation/reactor/TracingPublishers.java (100%) rename instrumentation/{reactor-3.1 => project-reactor-3.1}/src/main/java8/io/opentelemetry/auto/instrumentation/reactor/TracingSubscriber.java (100%) rename instrumentation/{reactor-3.1 => project-reactor-3.1}/src/test/groovy/ReactorCoreTest.groovy (100%) rename instrumentation/{rabbitmq-amqp-2.7/rabbitmq-amqp-2.7.gradle => rabbitmq-2.7/rabbitmq-2.7.gradle} (100%) rename instrumentation/{rabbitmq-amqp-2.7 => rabbitmq-2.7}/src/main/java/io/opentelemetry/auto/instrumentation/rabbitmq/amqp/RabbitChannelInstrumentation.java (100%) rename instrumentation/{rabbitmq-amqp-2.7 => rabbitmq-2.7}/src/main/java/io/opentelemetry/auto/instrumentation/rabbitmq/amqp/RabbitCommandInstrumentation.java (100%) rename instrumentation/{rabbitmq-amqp-2.7 => rabbitmq-2.7}/src/main/java/io/opentelemetry/auto/instrumentation/rabbitmq/amqp/RabbitDecorator.java (100%) rename instrumentation/{rabbitmq-amqp-2.7 => rabbitmq-2.7}/src/main/java/io/opentelemetry/auto/instrumentation/rabbitmq/amqp/TextMapExtractAdapter.java (100%) rename instrumentation/{rabbitmq-amqp-2.7 => rabbitmq-2.7}/src/main/java/io/opentelemetry/auto/instrumentation/rabbitmq/amqp/TextMapInjectAdapter.java (100%) rename instrumentation/{rabbitmq-amqp-2.7 => rabbitmq-2.7}/src/main/java/io/opentelemetry/auto/instrumentation/rabbitmq/amqp/TracedDelegatingConsumer.java (100%) rename instrumentation/{rabbitmq-amqp-2.7 => rabbitmq-2.7}/src/test/groovy/RabbitMQTest.groovy (100%) rename instrumentation/servlet/{request-2.3/request-2.3.gradle => servlet-2.3/servlet-2.3.gradle} (100%) rename instrumentation/servlet/{request-2.3 => servlet-2.3}/src/main/java/io/opentelemetry/auto/instrumentation/servlet/v2_3/Servlet2Advice.java (100%) rename instrumentation/servlet/{request-2.3 => servlet-2.3}/src/main/java/io/opentelemetry/auto/instrumentation/servlet/v2_3/Servlet2HttpServerTracer.java (100%) rename instrumentation/servlet/{request-2.3 => servlet-2.3}/src/main/java/io/opentelemetry/auto/instrumentation/servlet/v2_3/Servlet2Instrumentation.java (100%) rename instrumentation/servlet/{request-2.3 => servlet-2.3}/src/main/java/io/opentelemetry/auto/instrumentation/servlet/v2_3/Servlet2ResponseStatusInstrumentation.java (100%) rename instrumentation/servlet/{request-2.3 => servlet-2.3}/src/test/groovy/JettyServlet2Test.groovy (100%) rename instrumentation/servlet/{request-2.3 => servlet-2.3}/src/test/groovy/ServletTestInstrumentation.java (100%) rename instrumentation/servlet/{request-2.3 => servlet-2.3}/src/test/groovy/TestServlet2.groovy (100%) rename instrumentation/servlet/{request-2.3 => servlet-2.3}/src/test/resources/realm.properties (100%) rename instrumentation/servlet/{request-3.0/request-3.0.gradle => servlet-3.0/servlet-3.0.gradle} (100%) rename instrumentation/servlet/{request-3.0 => servlet-3.0}/src/main/java/io/opentelemetry/auto/instrumentation/servlet/v3_0/AsyncContextInstrumentation.java (100%) rename instrumentation/servlet/{request-3.0 => servlet-3.0}/src/main/java/io/opentelemetry/auto/instrumentation/servlet/v3_0/Servlet3Advice.java (100%) rename instrumentation/servlet/{request-3.0 => servlet-3.0}/src/main/java/io/opentelemetry/auto/instrumentation/servlet/v3_0/Servlet3HttpServerTracer.java (100%) rename instrumentation/servlet/{request-3.0 => servlet-3.0}/src/main/java/io/opentelemetry/auto/instrumentation/servlet/v3_0/Servlet3Instrumentation.java (100%) rename instrumentation/servlet/{request-3.0 => servlet-3.0}/src/main/java/io/opentelemetry/auto/instrumentation/servlet/v3_0/TagSettingAsyncListener.java (100%) rename instrumentation/servlet/{request-3.0 => servlet-3.0}/src/test/groovy/AbstractServlet3Test.groovy (100%) rename instrumentation/servlet/{request-3.0 => servlet-3.0}/src/test/groovy/JettyServlet3Test.groovy (100%) rename instrumentation/servlet/{request-3.0 => servlet-3.0}/src/test/groovy/JettyServletHandlerTest.groovy (100%) rename instrumentation/servlet/{request-3.0 => servlet-3.0}/src/test/groovy/RequestDispatcherServlet.java (100%) rename instrumentation/servlet/{request-3.0 => servlet-3.0}/src/test/groovy/ServletTestInstrumentation.java (100%) rename instrumentation/servlet/{request-3.0 => servlet-3.0}/src/test/groovy/TestServlet3.groovy (100%) rename instrumentation/servlet/{request-3.0 => servlet-3.0}/src/test/groovy/TomcatServlet3Test.groovy (100%) rename instrumentation/servlet/{request-3.0 => servlet-3.0}/src/test/resources/realm.properties (100%) rename instrumentation/{sparkjava-2.3/sparkjava-2.3.gradle => spark-web-framework-2.3/spark-web-framework-2.3.gradle} (100%) rename instrumentation/{sparkjava-2.3 => spark-web-framework-2.3}/src/main/java/io/opentelemetry/auto/instrumentation/sparkjava/RoutesInstrumentation.java (100%) rename instrumentation/{sparkjava-2.3 => spark-web-framework-2.3}/src/test/groovy/SparkJavaBasedTest.groovy (100%) rename instrumentation/{sparkjava-2.3 => spark-web-framework-2.3}/src/test/java/TestSparkJavaApplication.java (100%) diff --git a/benchmark/benchmark.gradle b/benchmark/benchmark.gradle index 62271c6b8149..bcc00b8e0295 100644 --- a/benchmark/benchmark.gradle +++ b/benchmark/benchmark.gradle @@ -43,7 +43,7 @@ jmh { jmhVersion = '1.23' // Specifies JMH version } -tasks.jmh.dependsOn(':opentelemetry-auto:shadowJar') +tasks.jmh.dependsOn(':opentelemetry-javaagent:shadowJar') /* If using libasyncProfiler, use the following to generate nice svg flamegraphs. diff --git a/gradle/instrumentation.gradle b/gradle/instrumentation.gradle index 679c400904e5..cd4775c950e1 100644 --- a/gradle/instrumentation.gradle +++ b/gradle/instrumentation.gradle @@ -44,7 +44,7 @@ afterEvaluate { testCompile project(':instrumentation:java-concurrent') // FIXME: we should enable this, but currently this fails tests for google http client //testCompile project(':instrumentation:http-url-connection') - testCompile project(':instrumentation:java-class-loader') + testCompile project(':instrumentation:java-classloader') testCompile project(':testing') testAnnotationProcessor deps.autoservice diff --git a/gradle/java.gradle b/gradle/java.gradle index 933cda77097b..9ef7a5017b84 100644 --- a/gradle/java.gradle +++ b/gradle/java.gradle @@ -15,7 +15,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-auto" || + project.path == ":opentelemetry-javaagent" || project.path == ":load-generator" || project.path.startsWith(":benchmark") || project.path.startsWith(":instrumentation")) diff --git a/instrumentation/dropwizard-testing/dropwizard-testing.gradle b/instrumentation/dropwizard-testing/dropwizard-testing.gradle index 88f643fc3c37..a8eadf981b15 100644 --- a/instrumentation/dropwizard-testing/dropwizard-testing.gradle +++ b/instrumentation/dropwizard-testing/dropwizard-testing.gradle @@ -11,7 +11,7 @@ apply from: "$rootDir/gradle/instrumentation.gradle" dependencies { testCompile project(':instrumentation:jaxrs:jaxrs-2.0') - testCompile project(':instrumentation:servlet:request-3.0') + testCompile project(':instrumentation:servlet:servlet-3.0') // First version with DropwizardTestSupport: testCompile group: 'io.dropwizard', name: 'dropwizard-testing', version: '0.8.0' diff --git a/instrumentation/java-class-loader/java-class-loader.gradle b/instrumentation/java-classloader/java-classloader.gradle similarity index 100% rename from instrumentation/java-class-loader/java-class-loader.gradle rename to instrumentation/java-classloader/java-classloader.gradle diff --git a/instrumentation/java-class-loader/jboss-testing/jboss-testing.gradle b/instrumentation/java-classloader/jboss-testing/jboss-testing.gradle similarity index 75% rename from instrumentation/java-class-loader/jboss-testing/jboss-testing.gradle rename to instrumentation/java-classloader/jboss-testing/jboss-testing.gradle index 1b706e2b3447..a950c49d046e 100644 --- a/instrumentation/java-class-loader/jboss-testing/jboss-testing.gradle +++ b/instrumentation/java-classloader/jboss-testing/jboss-testing.gradle @@ -2,7 +2,7 @@ ext.skipPublish = true apply from: "$rootDir/gradle/instrumentation.gradle" dependencies { - testCompile project(':instrumentation:java-class-loader') + testCompile project(':instrumentation:java-classloader') testCompile group: 'org.jboss.modules', name: 'jboss-modules', version: '1.3.10.Final' } diff --git a/instrumentation/java-class-loader/jboss-testing/src/test/groovy/JBossClassloadingTest.groovy b/instrumentation/java-classloader/jboss-testing/src/test/groovy/JBossClassloadingTest.groovy similarity index 100% rename from instrumentation/java-class-loader/jboss-testing/src/test/groovy/JBossClassloadingTest.groovy rename to instrumentation/java-classloader/jboss-testing/src/test/groovy/JBossClassloadingTest.groovy diff --git a/instrumentation/java-class-loader/osgi-testing/osgi-testing.gradle b/instrumentation/java-classloader/osgi-testing/osgi-testing.gradle similarity index 90% rename from instrumentation/java-class-loader/osgi-testing/osgi-testing.gradle rename to instrumentation/java-classloader/osgi-testing/osgi-testing.gradle index 560a81b6bc51..31a487c1629c 100644 --- a/instrumentation/java-class-loader/osgi-testing/osgi-testing.gradle +++ b/instrumentation/java-classloader/osgi-testing/osgi-testing.gradle @@ -2,7 +2,7 @@ ext.skipPublish = true apply from: "$rootDir/gradle/instrumentation.gradle" dependencies { - testCompile project(':instrumentation:java-class-loader') + testCompile project(':instrumentation:java-classloader') // TODO: we should separate core and Eclipse tests at some point, // but right now core-specific tests are quite dump and are run with diff --git a/instrumentation/java-class-loader/osgi-testing/src/test/groovy/OSGIClassloadingTest.groovy b/instrumentation/java-classloader/osgi-testing/src/test/groovy/OSGIClassloadingTest.groovy similarity index 100% rename from instrumentation/java-class-loader/osgi-testing/src/test/groovy/OSGIClassloadingTest.groovy rename to instrumentation/java-classloader/osgi-testing/src/test/groovy/OSGIClassloadingTest.groovy diff --git a/instrumentation/java-class-loader/src/main/java/io/opentelemetry/auto/instrumentation/javaclassloader/ClassLoaderInstrumentation.java b/instrumentation/java-classloader/src/main/java/io/opentelemetry/auto/instrumentation/javaclassloader/ClassLoaderInstrumentation.java similarity index 100% rename from instrumentation/java-class-loader/src/main/java/io/opentelemetry/auto/instrumentation/javaclassloader/ClassLoaderInstrumentation.java rename to instrumentation/java-classloader/src/main/java/io/opentelemetry/auto/instrumentation/javaclassloader/ClassLoaderInstrumentation.java diff --git a/instrumentation/java-class-loader/src/test/groovy/ClassLoadingTest.groovy b/instrumentation/java-classloader/src/test/groovy/ClassLoadingTest.groovy similarity index 100% rename from instrumentation/java-class-loader/src/test/groovy/ClassLoadingTest.groovy rename to instrumentation/java-classloader/src/test/groovy/ClassLoadingTest.groovy diff --git a/instrumentation/java-class-loader/tomcat-testing/src/test/groovy/TomcatClassloadingTest.groovy b/instrumentation/java-classloader/tomcat-testing/src/test/groovy/TomcatClassloadingTest.groovy similarity index 100% rename from instrumentation/java-class-loader/tomcat-testing/src/test/groovy/TomcatClassloadingTest.groovy rename to instrumentation/java-classloader/tomcat-testing/src/test/groovy/TomcatClassloadingTest.groovy diff --git a/instrumentation/java-class-loader/tomcat-testing/tomcat-testing.gradle b/instrumentation/java-classloader/tomcat-testing/tomcat-testing.gradle similarity index 91% rename from instrumentation/java-class-loader/tomcat-testing/tomcat-testing.gradle rename to instrumentation/java-classloader/tomcat-testing/tomcat-testing.gradle index 82ce1dc3f871..c5a8ebace744 100644 --- a/instrumentation/java-class-loader/tomcat-testing/tomcat-testing.gradle +++ b/instrumentation/java-classloader/tomcat-testing/tomcat-testing.gradle @@ -19,7 +19,7 @@ testSets { } dependencies { - testCompile project(':instrumentation:java-class-loader') + testCompile project(':instrumentation:java-classloader') //This seems to be the earliest version that has org.apache.catalina.loader.WebappClassLoaderBase //Older versions would require slightly different instrumentation. diff --git a/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0.gradle b/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0.gradle index 05a5dbf3a010..ba56cff5fd91 100644 --- a/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0.gradle +++ b/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0.gradle @@ -27,7 +27,7 @@ testSets { dependencies { compileOnly group: 'javax.ws.rs', name: 'javax.ws.rs-api', version: '2.0' - testCompile project(':instrumentation:servlet:request-3.0') + testCompile project(':instrumentation:servlet:servlet-3.0') testCompile project(':instrumentation:jaxrs:jaxrs-2.0:jaxrs-2.0-jersey-2.0') testCompile project(':instrumentation:jaxrs:jaxrs-2.0:jaxrs-2.0-resteasy-3.0') testCompile project(':instrumentation:jaxrs:jaxrs-2.0:jaxrs-2.0-resteasy-3.1') diff --git a/instrumentation/jsp-2.3/jsp-2.3.gradle b/instrumentation/jsp-2.3/jsp-2.3.gradle index 35eba9f571c4..4dd5ba54eafd 100644 --- a/instrumentation/jsp-2.3/jsp-2.3.gradle +++ b/instrumentation/jsp-2.3/jsp-2.3.gradle @@ -22,7 +22,7 @@ dependencies { compileOnly group: 'javax.servlet.jsp', name: 'javax.servlet.jsp-api', version: '2.3.0' compileOnly group: 'javax.servlet', name: 'javax.servlet-api', version: '3.1.0' - testCompile project(':instrumentation:servlet:request-3.0') + testCompile project(':instrumentation:servlet:servlet-3.0') // using tomcat 7.0.37 because there seems to be some issues with Tomcat's jar scanning in versions < 7.0.37 // https://stackoverflow.com/questions/23484098/org-apache-tomcat-util-bcel-classfile-classformatexception-invalid-byte-tag-in testCompile group: 'org.apache.tomcat.embed', name: 'tomcat-embed-core', version: '7.0.37' diff --git a/instrumentation/lettuce/lettuce-5.0/lettuce-5.0.gradle b/instrumentation/lettuce/lettuce-5.0/lettuce-5.0.gradle index f4c93a719778..cc6c31be5835 100644 --- a/instrumentation/lettuce/lettuce-5.0/lettuce-5.0.gradle +++ b/instrumentation/lettuce/lettuce-5.0/lettuce-5.0.gradle @@ -20,5 +20,5 @@ dependencies { testCompile group: 'com.github.kstyrc', name: 'embedded-redis', version: '0.6' testCompile group: 'io.lettuce', name: 'lettuce-core', version: '5.0.0.RELEASE' - testCompile project(':instrumentation:reactor-3.1') + testCompile project(':instrumentation:project-reactor-3.1') } diff --git a/instrumentation/lettuce/lettuce-5.1/lettuce-5.1.gradle b/instrumentation/lettuce/lettuce-5.1/lettuce-5.1.gradle index f0ab989e0b63..2e5ebe6626c7 100644 --- a/instrumentation/lettuce/lettuce-5.1/lettuce-5.1.gradle +++ b/instrumentation/lettuce/lettuce-5.1/lettuce-5.1.gradle @@ -27,7 +27,7 @@ dependencies { testCompile group: 'com.github.kstyrc', name: 'embedded-redis', version: '0.6' // Only 5.2+ will have command arguments in the db.statement tag. testCompile group: 'io.lettuce', name: 'lettuce-core', version: '5.2.0.RELEASE' - testCompile project(':instrumentation:reactor-3.1') + testCompile project(':instrumentation:project-reactor-3.1') latestDepTestCompile group: 'io.lettuce', name: 'lettuce-core', version: '5.+' } diff --git a/instrumentation/reactor-3.1/reactor-3.1.gradle b/instrumentation/project-reactor-3.1/project-reactor-3.1.gradle similarity index 100% rename from instrumentation/reactor-3.1/reactor-3.1.gradle rename to instrumentation/project-reactor-3.1/project-reactor-3.1.gradle diff --git a/instrumentation/reactor-3.1/src/main/java/io/opentelemetry/auto/instrumentation/reactor/ReactorHooksInstrumentation.java b/instrumentation/project-reactor-3.1/src/main/java/io/opentelemetry/auto/instrumentation/reactor/ReactorHooksInstrumentation.java similarity index 100% rename from instrumentation/reactor-3.1/src/main/java/io/opentelemetry/auto/instrumentation/reactor/ReactorHooksInstrumentation.java rename to instrumentation/project-reactor-3.1/src/main/java/io/opentelemetry/auto/instrumentation/reactor/ReactorHooksInstrumentation.java diff --git a/instrumentation/reactor-3.1/src/main/java8/io/opentelemetry/auto/instrumentation/reactor/FluxAndMonoSubscribeAdvice.java b/instrumentation/project-reactor-3.1/src/main/java8/io/opentelemetry/auto/instrumentation/reactor/FluxAndMonoSubscribeAdvice.java similarity index 100% rename from instrumentation/reactor-3.1/src/main/java8/io/opentelemetry/auto/instrumentation/reactor/FluxAndMonoSubscribeAdvice.java rename to instrumentation/project-reactor-3.1/src/main/java8/io/opentelemetry/auto/instrumentation/reactor/FluxAndMonoSubscribeAdvice.java diff --git a/instrumentation/reactor-3.1/src/main/java8/io/opentelemetry/auto/instrumentation/reactor/ReactorCoreAdviceUtils.java b/instrumentation/project-reactor-3.1/src/main/java8/io/opentelemetry/auto/instrumentation/reactor/ReactorCoreAdviceUtils.java similarity index 100% rename from instrumentation/reactor-3.1/src/main/java8/io/opentelemetry/auto/instrumentation/reactor/ReactorCoreAdviceUtils.java rename to instrumentation/project-reactor-3.1/src/main/java8/io/opentelemetry/auto/instrumentation/reactor/ReactorCoreAdviceUtils.java diff --git a/instrumentation/reactor-3.1/src/main/java8/io/opentelemetry/auto/instrumentation/reactor/ReactorHooksAdvice.java b/instrumentation/project-reactor-3.1/src/main/java8/io/opentelemetry/auto/instrumentation/reactor/ReactorHooksAdvice.java similarity index 100% rename from instrumentation/reactor-3.1/src/main/java8/io/opentelemetry/auto/instrumentation/reactor/ReactorHooksAdvice.java rename to instrumentation/project-reactor-3.1/src/main/java8/io/opentelemetry/auto/instrumentation/reactor/ReactorHooksAdvice.java diff --git a/instrumentation/reactor-3.1/src/main/java8/io/opentelemetry/auto/instrumentation/reactor/TracingPublishers.java b/instrumentation/project-reactor-3.1/src/main/java8/io/opentelemetry/auto/instrumentation/reactor/TracingPublishers.java similarity index 100% rename from instrumentation/reactor-3.1/src/main/java8/io/opentelemetry/auto/instrumentation/reactor/TracingPublishers.java rename to instrumentation/project-reactor-3.1/src/main/java8/io/opentelemetry/auto/instrumentation/reactor/TracingPublishers.java diff --git a/instrumentation/reactor-3.1/src/main/java8/io/opentelemetry/auto/instrumentation/reactor/TracingSubscriber.java b/instrumentation/project-reactor-3.1/src/main/java8/io/opentelemetry/auto/instrumentation/reactor/TracingSubscriber.java similarity index 100% rename from instrumentation/reactor-3.1/src/main/java8/io/opentelemetry/auto/instrumentation/reactor/TracingSubscriber.java rename to instrumentation/project-reactor-3.1/src/main/java8/io/opentelemetry/auto/instrumentation/reactor/TracingSubscriber.java diff --git a/instrumentation/reactor-3.1/src/test/groovy/ReactorCoreTest.groovy b/instrumentation/project-reactor-3.1/src/test/groovy/ReactorCoreTest.groovy similarity index 100% rename from instrumentation/reactor-3.1/src/test/groovy/ReactorCoreTest.groovy rename to instrumentation/project-reactor-3.1/src/test/groovy/ReactorCoreTest.groovy diff --git a/instrumentation/rabbitmq-amqp-2.7/rabbitmq-amqp-2.7.gradle b/instrumentation/rabbitmq-2.7/rabbitmq-2.7.gradle similarity index 100% rename from instrumentation/rabbitmq-amqp-2.7/rabbitmq-amqp-2.7.gradle rename to instrumentation/rabbitmq-2.7/rabbitmq-2.7.gradle diff --git a/instrumentation/rabbitmq-amqp-2.7/src/main/java/io/opentelemetry/auto/instrumentation/rabbitmq/amqp/RabbitChannelInstrumentation.java b/instrumentation/rabbitmq-2.7/src/main/java/io/opentelemetry/auto/instrumentation/rabbitmq/amqp/RabbitChannelInstrumentation.java similarity index 100% rename from instrumentation/rabbitmq-amqp-2.7/src/main/java/io/opentelemetry/auto/instrumentation/rabbitmq/amqp/RabbitChannelInstrumentation.java rename to instrumentation/rabbitmq-2.7/src/main/java/io/opentelemetry/auto/instrumentation/rabbitmq/amqp/RabbitChannelInstrumentation.java diff --git a/instrumentation/rabbitmq-amqp-2.7/src/main/java/io/opentelemetry/auto/instrumentation/rabbitmq/amqp/RabbitCommandInstrumentation.java b/instrumentation/rabbitmq-2.7/src/main/java/io/opentelemetry/auto/instrumentation/rabbitmq/amqp/RabbitCommandInstrumentation.java similarity index 100% rename from instrumentation/rabbitmq-amqp-2.7/src/main/java/io/opentelemetry/auto/instrumentation/rabbitmq/amqp/RabbitCommandInstrumentation.java rename to instrumentation/rabbitmq-2.7/src/main/java/io/opentelemetry/auto/instrumentation/rabbitmq/amqp/RabbitCommandInstrumentation.java diff --git a/instrumentation/rabbitmq-amqp-2.7/src/main/java/io/opentelemetry/auto/instrumentation/rabbitmq/amqp/RabbitDecorator.java b/instrumentation/rabbitmq-2.7/src/main/java/io/opentelemetry/auto/instrumentation/rabbitmq/amqp/RabbitDecorator.java similarity index 100% rename from instrumentation/rabbitmq-amqp-2.7/src/main/java/io/opentelemetry/auto/instrumentation/rabbitmq/amqp/RabbitDecorator.java rename to instrumentation/rabbitmq-2.7/src/main/java/io/opentelemetry/auto/instrumentation/rabbitmq/amqp/RabbitDecorator.java diff --git a/instrumentation/rabbitmq-amqp-2.7/src/main/java/io/opentelemetry/auto/instrumentation/rabbitmq/amqp/TextMapExtractAdapter.java b/instrumentation/rabbitmq-2.7/src/main/java/io/opentelemetry/auto/instrumentation/rabbitmq/amqp/TextMapExtractAdapter.java similarity index 100% rename from instrumentation/rabbitmq-amqp-2.7/src/main/java/io/opentelemetry/auto/instrumentation/rabbitmq/amqp/TextMapExtractAdapter.java rename to instrumentation/rabbitmq-2.7/src/main/java/io/opentelemetry/auto/instrumentation/rabbitmq/amqp/TextMapExtractAdapter.java diff --git a/instrumentation/rabbitmq-amqp-2.7/src/main/java/io/opentelemetry/auto/instrumentation/rabbitmq/amqp/TextMapInjectAdapter.java b/instrumentation/rabbitmq-2.7/src/main/java/io/opentelemetry/auto/instrumentation/rabbitmq/amqp/TextMapInjectAdapter.java similarity index 100% rename from instrumentation/rabbitmq-amqp-2.7/src/main/java/io/opentelemetry/auto/instrumentation/rabbitmq/amqp/TextMapInjectAdapter.java rename to instrumentation/rabbitmq-2.7/src/main/java/io/opentelemetry/auto/instrumentation/rabbitmq/amqp/TextMapInjectAdapter.java diff --git a/instrumentation/rabbitmq-amqp-2.7/src/main/java/io/opentelemetry/auto/instrumentation/rabbitmq/amqp/TracedDelegatingConsumer.java b/instrumentation/rabbitmq-2.7/src/main/java/io/opentelemetry/auto/instrumentation/rabbitmq/amqp/TracedDelegatingConsumer.java similarity index 100% rename from instrumentation/rabbitmq-amqp-2.7/src/main/java/io/opentelemetry/auto/instrumentation/rabbitmq/amqp/TracedDelegatingConsumer.java rename to instrumentation/rabbitmq-2.7/src/main/java/io/opentelemetry/auto/instrumentation/rabbitmq/amqp/TracedDelegatingConsumer.java diff --git a/instrumentation/rabbitmq-amqp-2.7/src/test/groovy/RabbitMQTest.groovy b/instrumentation/rabbitmq-2.7/src/test/groovy/RabbitMQTest.groovy similarity index 100% rename from instrumentation/rabbitmq-amqp-2.7/src/test/groovy/RabbitMQTest.groovy rename to instrumentation/rabbitmq-2.7/src/test/groovy/RabbitMQTest.groovy diff --git a/instrumentation/servlet/glassfish-testing/glassfish-testing.gradle b/instrumentation/servlet/glassfish-testing/glassfish-testing.gradle index ebcb604d3252..b8df8997eba1 100644 --- a/instrumentation/servlet/glassfish-testing/glassfish-testing.gradle +++ b/instrumentation/servlet/glassfish-testing/glassfish-testing.gradle @@ -14,7 +14,7 @@ testSets { } dependencies { - testCompile project(':instrumentation:servlet:request-3.0') + testCompile project(':instrumentation:servlet:servlet-3.0') testCompile project(':instrumentation:grizzly-2.0') testCompile group: 'org.glassfish.main.extras', name: 'glassfish-embedded-all', version: '4.0' diff --git a/instrumentation/servlet/request-2.3/request-2.3.gradle b/instrumentation/servlet/servlet-2.3/servlet-2.3.gradle similarity index 100% rename from instrumentation/servlet/request-2.3/request-2.3.gradle rename to instrumentation/servlet/servlet-2.3/servlet-2.3.gradle diff --git a/instrumentation/servlet/request-2.3/src/main/java/io/opentelemetry/auto/instrumentation/servlet/v2_3/Servlet2Advice.java b/instrumentation/servlet/servlet-2.3/src/main/java/io/opentelemetry/auto/instrumentation/servlet/v2_3/Servlet2Advice.java similarity index 100% rename from instrumentation/servlet/request-2.3/src/main/java/io/opentelemetry/auto/instrumentation/servlet/v2_3/Servlet2Advice.java rename to instrumentation/servlet/servlet-2.3/src/main/java/io/opentelemetry/auto/instrumentation/servlet/v2_3/Servlet2Advice.java diff --git a/instrumentation/servlet/request-2.3/src/main/java/io/opentelemetry/auto/instrumentation/servlet/v2_3/Servlet2HttpServerTracer.java b/instrumentation/servlet/servlet-2.3/src/main/java/io/opentelemetry/auto/instrumentation/servlet/v2_3/Servlet2HttpServerTracer.java similarity index 100% rename from instrumentation/servlet/request-2.3/src/main/java/io/opentelemetry/auto/instrumentation/servlet/v2_3/Servlet2HttpServerTracer.java rename to instrumentation/servlet/servlet-2.3/src/main/java/io/opentelemetry/auto/instrumentation/servlet/v2_3/Servlet2HttpServerTracer.java diff --git a/instrumentation/servlet/request-2.3/src/main/java/io/opentelemetry/auto/instrumentation/servlet/v2_3/Servlet2Instrumentation.java b/instrumentation/servlet/servlet-2.3/src/main/java/io/opentelemetry/auto/instrumentation/servlet/v2_3/Servlet2Instrumentation.java similarity index 100% rename from instrumentation/servlet/request-2.3/src/main/java/io/opentelemetry/auto/instrumentation/servlet/v2_3/Servlet2Instrumentation.java rename to instrumentation/servlet/servlet-2.3/src/main/java/io/opentelemetry/auto/instrumentation/servlet/v2_3/Servlet2Instrumentation.java diff --git a/instrumentation/servlet/request-2.3/src/main/java/io/opentelemetry/auto/instrumentation/servlet/v2_3/Servlet2ResponseStatusInstrumentation.java b/instrumentation/servlet/servlet-2.3/src/main/java/io/opentelemetry/auto/instrumentation/servlet/v2_3/Servlet2ResponseStatusInstrumentation.java similarity index 100% rename from instrumentation/servlet/request-2.3/src/main/java/io/opentelemetry/auto/instrumentation/servlet/v2_3/Servlet2ResponseStatusInstrumentation.java rename to instrumentation/servlet/servlet-2.3/src/main/java/io/opentelemetry/auto/instrumentation/servlet/v2_3/Servlet2ResponseStatusInstrumentation.java diff --git a/instrumentation/servlet/request-2.3/src/test/groovy/JettyServlet2Test.groovy b/instrumentation/servlet/servlet-2.3/src/test/groovy/JettyServlet2Test.groovy similarity index 100% rename from instrumentation/servlet/request-2.3/src/test/groovy/JettyServlet2Test.groovy rename to instrumentation/servlet/servlet-2.3/src/test/groovy/JettyServlet2Test.groovy diff --git a/instrumentation/servlet/request-2.3/src/test/groovy/ServletTestInstrumentation.java b/instrumentation/servlet/servlet-2.3/src/test/groovy/ServletTestInstrumentation.java similarity index 100% rename from instrumentation/servlet/request-2.3/src/test/groovy/ServletTestInstrumentation.java rename to instrumentation/servlet/servlet-2.3/src/test/groovy/ServletTestInstrumentation.java diff --git a/instrumentation/servlet/request-2.3/src/test/groovy/TestServlet2.groovy b/instrumentation/servlet/servlet-2.3/src/test/groovy/TestServlet2.groovy similarity index 100% rename from instrumentation/servlet/request-2.3/src/test/groovy/TestServlet2.groovy rename to instrumentation/servlet/servlet-2.3/src/test/groovy/TestServlet2.groovy diff --git a/instrumentation/servlet/request-2.3/src/test/resources/realm.properties b/instrumentation/servlet/servlet-2.3/src/test/resources/realm.properties similarity index 100% rename from instrumentation/servlet/request-2.3/src/test/resources/realm.properties rename to instrumentation/servlet/servlet-2.3/src/test/resources/realm.properties diff --git a/instrumentation/servlet/request-3.0/request-3.0.gradle b/instrumentation/servlet/servlet-3.0/servlet-3.0.gradle similarity index 100% rename from instrumentation/servlet/request-3.0/request-3.0.gradle rename to instrumentation/servlet/servlet-3.0/servlet-3.0.gradle diff --git a/instrumentation/servlet/request-3.0/src/main/java/io/opentelemetry/auto/instrumentation/servlet/v3_0/AsyncContextInstrumentation.java b/instrumentation/servlet/servlet-3.0/src/main/java/io/opentelemetry/auto/instrumentation/servlet/v3_0/AsyncContextInstrumentation.java similarity index 100% rename from instrumentation/servlet/request-3.0/src/main/java/io/opentelemetry/auto/instrumentation/servlet/v3_0/AsyncContextInstrumentation.java rename to instrumentation/servlet/servlet-3.0/src/main/java/io/opentelemetry/auto/instrumentation/servlet/v3_0/AsyncContextInstrumentation.java diff --git a/instrumentation/servlet/request-3.0/src/main/java/io/opentelemetry/auto/instrumentation/servlet/v3_0/Servlet3Advice.java b/instrumentation/servlet/servlet-3.0/src/main/java/io/opentelemetry/auto/instrumentation/servlet/v3_0/Servlet3Advice.java similarity index 100% rename from instrumentation/servlet/request-3.0/src/main/java/io/opentelemetry/auto/instrumentation/servlet/v3_0/Servlet3Advice.java rename to instrumentation/servlet/servlet-3.0/src/main/java/io/opentelemetry/auto/instrumentation/servlet/v3_0/Servlet3Advice.java diff --git a/instrumentation/servlet/request-3.0/src/main/java/io/opentelemetry/auto/instrumentation/servlet/v3_0/Servlet3HttpServerTracer.java b/instrumentation/servlet/servlet-3.0/src/main/java/io/opentelemetry/auto/instrumentation/servlet/v3_0/Servlet3HttpServerTracer.java similarity index 100% rename from instrumentation/servlet/request-3.0/src/main/java/io/opentelemetry/auto/instrumentation/servlet/v3_0/Servlet3HttpServerTracer.java rename to instrumentation/servlet/servlet-3.0/src/main/java/io/opentelemetry/auto/instrumentation/servlet/v3_0/Servlet3HttpServerTracer.java diff --git a/instrumentation/servlet/request-3.0/src/main/java/io/opentelemetry/auto/instrumentation/servlet/v3_0/Servlet3Instrumentation.java b/instrumentation/servlet/servlet-3.0/src/main/java/io/opentelemetry/auto/instrumentation/servlet/v3_0/Servlet3Instrumentation.java similarity index 100% rename from instrumentation/servlet/request-3.0/src/main/java/io/opentelemetry/auto/instrumentation/servlet/v3_0/Servlet3Instrumentation.java rename to instrumentation/servlet/servlet-3.0/src/main/java/io/opentelemetry/auto/instrumentation/servlet/v3_0/Servlet3Instrumentation.java diff --git a/instrumentation/servlet/request-3.0/src/main/java/io/opentelemetry/auto/instrumentation/servlet/v3_0/TagSettingAsyncListener.java b/instrumentation/servlet/servlet-3.0/src/main/java/io/opentelemetry/auto/instrumentation/servlet/v3_0/TagSettingAsyncListener.java similarity index 100% rename from instrumentation/servlet/request-3.0/src/main/java/io/opentelemetry/auto/instrumentation/servlet/v3_0/TagSettingAsyncListener.java rename to instrumentation/servlet/servlet-3.0/src/main/java/io/opentelemetry/auto/instrumentation/servlet/v3_0/TagSettingAsyncListener.java diff --git a/instrumentation/servlet/request-3.0/src/test/groovy/AbstractServlet3Test.groovy b/instrumentation/servlet/servlet-3.0/src/test/groovy/AbstractServlet3Test.groovy similarity index 100% rename from instrumentation/servlet/request-3.0/src/test/groovy/AbstractServlet3Test.groovy rename to instrumentation/servlet/servlet-3.0/src/test/groovy/AbstractServlet3Test.groovy diff --git a/instrumentation/servlet/request-3.0/src/test/groovy/JettyServlet3Test.groovy b/instrumentation/servlet/servlet-3.0/src/test/groovy/JettyServlet3Test.groovy similarity index 100% rename from instrumentation/servlet/request-3.0/src/test/groovy/JettyServlet3Test.groovy rename to instrumentation/servlet/servlet-3.0/src/test/groovy/JettyServlet3Test.groovy diff --git a/instrumentation/servlet/request-3.0/src/test/groovy/JettyServletHandlerTest.groovy b/instrumentation/servlet/servlet-3.0/src/test/groovy/JettyServletHandlerTest.groovy similarity index 100% rename from instrumentation/servlet/request-3.0/src/test/groovy/JettyServletHandlerTest.groovy rename to instrumentation/servlet/servlet-3.0/src/test/groovy/JettyServletHandlerTest.groovy diff --git a/instrumentation/servlet/request-3.0/src/test/groovy/RequestDispatcherServlet.java b/instrumentation/servlet/servlet-3.0/src/test/groovy/RequestDispatcherServlet.java similarity index 100% rename from instrumentation/servlet/request-3.0/src/test/groovy/RequestDispatcherServlet.java rename to instrumentation/servlet/servlet-3.0/src/test/groovy/RequestDispatcherServlet.java diff --git a/instrumentation/servlet/request-3.0/src/test/groovy/ServletTestInstrumentation.java b/instrumentation/servlet/servlet-3.0/src/test/groovy/ServletTestInstrumentation.java similarity index 100% rename from instrumentation/servlet/request-3.0/src/test/groovy/ServletTestInstrumentation.java rename to instrumentation/servlet/servlet-3.0/src/test/groovy/ServletTestInstrumentation.java diff --git a/instrumentation/servlet/request-3.0/src/test/groovy/TestServlet3.groovy b/instrumentation/servlet/servlet-3.0/src/test/groovy/TestServlet3.groovy similarity index 100% rename from instrumentation/servlet/request-3.0/src/test/groovy/TestServlet3.groovy rename to instrumentation/servlet/servlet-3.0/src/test/groovy/TestServlet3.groovy diff --git a/instrumentation/servlet/request-3.0/src/test/groovy/TomcatServlet3Test.groovy b/instrumentation/servlet/servlet-3.0/src/test/groovy/TomcatServlet3Test.groovy similarity index 100% rename from instrumentation/servlet/request-3.0/src/test/groovy/TomcatServlet3Test.groovy rename to instrumentation/servlet/servlet-3.0/src/test/groovy/TomcatServlet3Test.groovy diff --git a/instrumentation/servlet/request-3.0/src/test/resources/realm.properties b/instrumentation/servlet/servlet-3.0/src/test/resources/realm.properties similarity index 100% rename from instrumentation/servlet/request-3.0/src/test/resources/realm.properties rename to instrumentation/servlet/servlet-3.0/src/test/resources/realm.properties diff --git a/instrumentation/servlet/servlet.gradle b/instrumentation/servlet/servlet.gradle index d55344c9439d..254b7bc87de1 100644 --- a/instrumentation/servlet/servlet.gradle +++ b/instrumentation/servlet/servlet.gradle @@ -22,7 +22,7 @@ dependencies { testCompile group: 'javax.servlet', name: 'servlet-api', version: '2.3' // servlet request instrumentation required for linking request to response. - testCompile project(':instrumentation:servlet:request-2.3') + testCompile project(':instrumentation:servlet:servlet-2.3') // Don't want to conflict with jetty from the test server. testCompile(project(':testing')) { diff --git a/instrumentation/sparkjava-2.3/sparkjava-2.3.gradle b/instrumentation/spark-web-framework-2.3/spark-web-framework-2.3.gradle similarity index 100% rename from instrumentation/sparkjava-2.3/sparkjava-2.3.gradle rename to instrumentation/spark-web-framework-2.3/spark-web-framework-2.3.gradle diff --git a/instrumentation/sparkjava-2.3/src/main/java/io/opentelemetry/auto/instrumentation/sparkjava/RoutesInstrumentation.java b/instrumentation/spark-web-framework-2.3/src/main/java/io/opentelemetry/auto/instrumentation/sparkjava/RoutesInstrumentation.java similarity index 100% rename from instrumentation/sparkjava-2.3/src/main/java/io/opentelemetry/auto/instrumentation/sparkjava/RoutesInstrumentation.java rename to instrumentation/spark-web-framework-2.3/src/main/java/io/opentelemetry/auto/instrumentation/sparkjava/RoutesInstrumentation.java diff --git a/instrumentation/sparkjava-2.3/src/test/groovy/SparkJavaBasedTest.groovy b/instrumentation/spark-web-framework-2.3/src/test/groovy/SparkJavaBasedTest.groovy similarity index 100% rename from instrumentation/sparkjava-2.3/src/test/groovy/SparkJavaBasedTest.groovy rename to instrumentation/spark-web-framework-2.3/src/test/groovy/SparkJavaBasedTest.groovy diff --git a/instrumentation/sparkjava-2.3/src/test/java/TestSparkJavaApplication.java b/instrumentation/spark-web-framework-2.3/src/test/java/TestSparkJavaApplication.java similarity index 100% rename from instrumentation/sparkjava-2.3/src/test/java/TestSparkJavaApplication.java rename to instrumentation/spark-web-framework-2.3/src/test/java/TestSparkJavaApplication.java diff --git a/instrumentation/spring-webflux-5.0/spring-webflux-5.0.gradle b/instrumentation/spring-webflux-5.0/spring-webflux-5.0.gradle index 8e3077360ea9..3b89a4752349 100644 --- a/instrumentation/spring-webflux-5.0/spring-webflux-5.0.gradle +++ b/instrumentation/spring-webflux-5.0/spring-webflux-5.0.gradle @@ -36,7 +36,7 @@ dependencies { testCompile project(':instrumentation:trace-annotation') testCompile project(':instrumentation:netty:netty-4.1') - testCompile project(':instrumentation:reactor-3.1') + testCompile project(':instrumentation:project-reactor-3.1') testCompile group: 'org.springframework.boot', name: 'spring-boot-starter-webflux', version: '2.0.0.RELEASE' testCompile group: 'org.springframework.boot', name: 'spring-boot-starter-test', version: '2.0.0.RELEASE' diff --git a/instrumentation/spring-webmvc-3.1/spring-webmvc-3.1.gradle b/instrumentation/spring-webmvc-3.1/spring-webmvc-3.1.gradle index 7879e808da24..44071af02d1f 100644 --- a/instrumentation/spring-webmvc-3.1/spring-webmvc-3.1.gradle +++ b/instrumentation/spring-webmvc-3.1/spring-webmvc-3.1.gradle @@ -33,7 +33,7 @@ dependencies { // Include servlet instrumentation for verifying the tomcat requests testCompile project(':instrumentation:servlet') - testCompile project(':instrumentation:servlet:request-3.0') + testCompile project(':instrumentation:servlet:servlet-3.0') testCompile group: 'javax.validation', name: 'validation-api', version: '1.1.0.Final' testCompile group: 'org.hibernate', name: 'hibernate-validator', version: '5.4.2.Final' diff --git a/load-generator/load-generator.gradle b/load-generator/load-generator.gradle index 93a21bf428ff..adc56f4bba65 100644 --- a/load-generator/load-generator.gradle +++ b/load-generator/load-generator.gradle @@ -8,11 +8,11 @@ dependencies { } task launch(type: JavaExec) { - dependsOn ':opentelemetry-auto:shadowJar' + dependsOn ':opentelemetry-javaagent:shadowJar' doFirst { classpath = sourceSets.main.runtimeClasspath main = 'io.opentelemetry.loadgenerator.LoadGenerator' - jvmArgs = ["-javaagent:${project(':opentelemetry-auto').shadowJar.archivePath}"] + jvmArgs = ["-javaagent:${project(':opentelemetry-javaagent').shadowJar.archivePath}"] systemProperties System.properties } } diff --git a/opentelemetry-javaagent/src/main/java/io/opentelemetry/auto/bootstrap/AgentBootstrap.java b/opentelemetry-javaagent/src/main/java/io/opentelemetry/auto/bootstrap/AgentBootstrap.java index 724fe0351e25..36147da36a6e 100644 --- a/opentelemetry-javaagent/src/main/java/io/opentelemetry/auto/bootstrap/AgentBootstrap.java +++ b/opentelemetry-javaagent/src/main/java/io/opentelemetry/auto/bootstrap/AgentBootstrap.java @@ -198,7 +198,7 @@ public static String getAgentVersion() throws IOException { try (final BufferedReader reader = new BufferedReader( new InputStreamReader( - AgentBootstrap.class.getResourceAsStream("/opentelemetry-auto.version"), + AgentBootstrap.class.getResourceAsStream("/opentelemetry-javaagent.version"), StandardCharsets.UTF_8))) { for (int c = reader.read(); c != -1; c = reader.read()) { diff --git a/settings.gradle b/settings.gradle index 9ed25f1f7406..8d7eb163780e 100644 --- a/settings.gradle +++ b/settings.gradle @@ -74,10 +74,10 @@ include ':instrumentation:hibernate:hibernate-4.3' include ':instrumentation:hibernate:hibernate-common' include ':instrumentation:http-url-connection' include ':instrumentation:hystrix-1.4' -include ':instrumentation:java-class-loader' -include ':instrumentation:java-class-loader:jboss-testing' -include ':instrumentation:java-class-loader:osgi-testing' -include ':instrumentation:java-class-loader:tomcat-testing' +include ':instrumentation:java-classloader' +include ':instrumentation:java-classloader:jboss-testing' +include ':instrumentation:java-classloader:osgi-testing' +include ':instrumentation:java-classloader:tomcat-testing' include ':instrumentation:java-concurrent' include ':instrumentation:java-concurrent:kotlin-testing' include ':instrumentation:java-concurrent:scala-testing' @@ -125,20 +125,20 @@ include ':instrumentation:play-ws:play-ws-1.0' include ':instrumentation:play-ws:play-ws-2.0' include ':instrumentation:play-ws:play-ws-2.1' include ':instrumentation:play-ws:play-ws-common' -include ':instrumentation:rabbitmq-amqp-2.7' +include ':instrumentation:rabbitmq-2.7' include ':instrumentation:ratpack-1.5' -include ':instrumentation:reactor-3.1' +include ':instrumentation:project-reactor-3.1' include ':instrumentation:rediscala-1.8' include ':instrumentation:rmi' include ':instrumentation:rxjava-1.0' include ':instrumentation:servlet' include ':instrumentation:servlet:glassfish-testing' include ':instrumentation:servlet:servlet-common' -include ':instrumentation:servlet:request-2.3' -include ':instrumentation:servlet:request-3.0' +include ':instrumentation:servlet:servlet-2.3' +include ':instrumentation:servlet:servlet-3.0' // FIXME this instrumentation relied on scope listener // include ':instrumentation:slf4j-mdc' -include ':instrumentation:sparkjava-2.3' +include ':instrumentation:spark-web-framework-2.3' include ':instrumentation:spring-data-1.8' include ':instrumentation:spring-scheduling-3.1' include ':instrumentation:spring-webmvc-3.1' diff --git a/smoke-tests/smoke-tests.gradle b/smoke-tests/smoke-tests.gradle index 486c2335f244..c871284cd301 100644 --- a/smoke-tests/smoke-tests.gradle +++ b/smoke-tests/smoke-tests.gradle @@ -10,12 +10,12 @@ dependencies { subprojects { subProject -> subProject.tasks.withType(Test).configureEach { - dependsOn = [':opentelemetry-auto:shadowJar', ':auto-exporters:opentelemetry-auto-exporter-logging:shadowJar'] + dependsOn = [':opentelemetry-javaagent:shadowJar', ':auto-exporters:opentelemetry-auto-exporter-logging:shadowJar'] doFirst { // Tests depend on this to know where to run things and what agent jar to use jvmArgs "-Dio.opentelemetry.smoketest.builddir=${buildDir}" - jvmArgs "-Dio.opentelemetry.smoketest.agent.shadowJar.path=${project(':opentelemetry-auto').tasks.shadowJar.archivePath}" + jvmArgs "-Dio.opentelemetry.smoketest.agent.shadowJar.path=${project(':opentelemetry-javaagent').tasks.shadowJar.archivePath}" jvmArgs "-Dota.exporter.jar=${project(':auto-exporters:opentelemetry-auto-exporter-logging').tasks.shadowJar.archivePath}" } } From 169261505eadfccf2c39e9bc7f66f0c3d19948eb Mon Sep 17 00:00:00 2001 From: Nikita Salnikov-Tarnovski Date: Fri, 26 Jun 2020 20:18:00 +0300 Subject: [PATCH 5/6] Fix CI config --- .circleci/collect_libs.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/collect_libs.sh b/.circleci/collect_libs.sh index cf87a4bd7bea..31247730e1eb 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/java-agent/build/libs/*.jar $LIBS_DIR/ +cp workspace/opentelemetry-javaagent/build/libs/*.jar $LIBS_DIR/ cp workspace/auto-exporters/*/build/libs/*.jar $LIBS_DIR/ From 9616918a4dff486d18edc21252c81a011fd53c79 Mon Sep 17 00:00:00 2001 From: Nikita Salnikov-Tarnovski Date: Sat, 27 Jun 2020 07:26:45 +0300 Subject: [PATCH 6/6] Rename project-reactor back to reactor --- instrumentation/lettuce/lettuce-5.0/lettuce-5.0.gradle | 2 +- instrumentation/lettuce/lettuce-5.1/lettuce-5.1.gradle | 2 +- .../reactor-3.1.gradle} | 0 .../instrumentation/reactor/ReactorHooksInstrumentation.java | 0 .../instrumentation/reactor/FluxAndMonoSubscribeAdvice.java | 0 .../auto/instrumentation/reactor/ReactorCoreAdviceUtils.java | 0 .../auto/instrumentation/reactor/ReactorHooksAdvice.java | 0 .../auto/instrumentation/reactor/TracingPublishers.java | 0 .../auto/instrumentation/reactor/TracingSubscriber.java | 0 .../src/test/groovy/ReactorCoreTest.groovy | 0 instrumentation/spring-webflux-5.0/spring-webflux-5.0.gradle | 2 +- settings.gradle | 2 +- 12 files changed, 4 insertions(+), 4 deletions(-) rename instrumentation/{project-reactor-3.1/project-reactor-3.1.gradle => reactor-3.1/reactor-3.1.gradle} (100%) rename instrumentation/{project-reactor-3.1 => reactor-3.1}/src/main/java/io/opentelemetry/auto/instrumentation/reactor/ReactorHooksInstrumentation.java (100%) rename instrumentation/{project-reactor-3.1 => reactor-3.1}/src/main/java8/io/opentelemetry/auto/instrumentation/reactor/FluxAndMonoSubscribeAdvice.java (100%) rename instrumentation/{project-reactor-3.1 => reactor-3.1}/src/main/java8/io/opentelemetry/auto/instrumentation/reactor/ReactorCoreAdviceUtils.java (100%) rename instrumentation/{project-reactor-3.1 => reactor-3.1}/src/main/java8/io/opentelemetry/auto/instrumentation/reactor/ReactorHooksAdvice.java (100%) rename instrumentation/{project-reactor-3.1 => reactor-3.1}/src/main/java8/io/opentelemetry/auto/instrumentation/reactor/TracingPublishers.java (100%) rename instrumentation/{project-reactor-3.1 => reactor-3.1}/src/main/java8/io/opentelemetry/auto/instrumentation/reactor/TracingSubscriber.java (100%) rename instrumentation/{project-reactor-3.1 => reactor-3.1}/src/test/groovy/ReactorCoreTest.groovy (100%) diff --git a/instrumentation/lettuce/lettuce-5.0/lettuce-5.0.gradle b/instrumentation/lettuce/lettuce-5.0/lettuce-5.0.gradle index cc6c31be5835..f4c93a719778 100644 --- a/instrumentation/lettuce/lettuce-5.0/lettuce-5.0.gradle +++ b/instrumentation/lettuce/lettuce-5.0/lettuce-5.0.gradle @@ -20,5 +20,5 @@ dependencies { testCompile group: 'com.github.kstyrc', name: 'embedded-redis', version: '0.6' testCompile group: 'io.lettuce', name: 'lettuce-core', version: '5.0.0.RELEASE' - testCompile project(':instrumentation:project-reactor-3.1') + testCompile project(':instrumentation:reactor-3.1') } diff --git a/instrumentation/lettuce/lettuce-5.1/lettuce-5.1.gradle b/instrumentation/lettuce/lettuce-5.1/lettuce-5.1.gradle index 2e5ebe6626c7..f0ab989e0b63 100644 --- a/instrumentation/lettuce/lettuce-5.1/lettuce-5.1.gradle +++ b/instrumentation/lettuce/lettuce-5.1/lettuce-5.1.gradle @@ -27,7 +27,7 @@ dependencies { testCompile group: 'com.github.kstyrc', name: 'embedded-redis', version: '0.6' // Only 5.2+ will have command arguments in the db.statement tag. testCompile group: 'io.lettuce', name: 'lettuce-core', version: '5.2.0.RELEASE' - testCompile project(':instrumentation:project-reactor-3.1') + testCompile project(':instrumentation:reactor-3.1') latestDepTestCompile group: 'io.lettuce', name: 'lettuce-core', version: '5.+' } diff --git a/instrumentation/project-reactor-3.1/project-reactor-3.1.gradle b/instrumentation/reactor-3.1/reactor-3.1.gradle similarity index 100% rename from instrumentation/project-reactor-3.1/project-reactor-3.1.gradle rename to instrumentation/reactor-3.1/reactor-3.1.gradle diff --git a/instrumentation/project-reactor-3.1/src/main/java/io/opentelemetry/auto/instrumentation/reactor/ReactorHooksInstrumentation.java b/instrumentation/reactor-3.1/src/main/java/io/opentelemetry/auto/instrumentation/reactor/ReactorHooksInstrumentation.java similarity index 100% rename from instrumentation/project-reactor-3.1/src/main/java/io/opentelemetry/auto/instrumentation/reactor/ReactorHooksInstrumentation.java rename to instrumentation/reactor-3.1/src/main/java/io/opentelemetry/auto/instrumentation/reactor/ReactorHooksInstrumentation.java diff --git a/instrumentation/project-reactor-3.1/src/main/java8/io/opentelemetry/auto/instrumentation/reactor/FluxAndMonoSubscribeAdvice.java b/instrumentation/reactor-3.1/src/main/java8/io/opentelemetry/auto/instrumentation/reactor/FluxAndMonoSubscribeAdvice.java similarity index 100% rename from instrumentation/project-reactor-3.1/src/main/java8/io/opentelemetry/auto/instrumentation/reactor/FluxAndMonoSubscribeAdvice.java rename to instrumentation/reactor-3.1/src/main/java8/io/opentelemetry/auto/instrumentation/reactor/FluxAndMonoSubscribeAdvice.java diff --git a/instrumentation/project-reactor-3.1/src/main/java8/io/opentelemetry/auto/instrumentation/reactor/ReactorCoreAdviceUtils.java b/instrumentation/reactor-3.1/src/main/java8/io/opentelemetry/auto/instrumentation/reactor/ReactorCoreAdviceUtils.java similarity index 100% rename from instrumentation/project-reactor-3.1/src/main/java8/io/opentelemetry/auto/instrumentation/reactor/ReactorCoreAdviceUtils.java rename to instrumentation/reactor-3.1/src/main/java8/io/opentelemetry/auto/instrumentation/reactor/ReactorCoreAdviceUtils.java diff --git a/instrumentation/project-reactor-3.1/src/main/java8/io/opentelemetry/auto/instrumentation/reactor/ReactorHooksAdvice.java b/instrumentation/reactor-3.1/src/main/java8/io/opentelemetry/auto/instrumentation/reactor/ReactorHooksAdvice.java similarity index 100% rename from instrumentation/project-reactor-3.1/src/main/java8/io/opentelemetry/auto/instrumentation/reactor/ReactorHooksAdvice.java rename to instrumentation/reactor-3.1/src/main/java8/io/opentelemetry/auto/instrumentation/reactor/ReactorHooksAdvice.java diff --git a/instrumentation/project-reactor-3.1/src/main/java8/io/opentelemetry/auto/instrumentation/reactor/TracingPublishers.java b/instrumentation/reactor-3.1/src/main/java8/io/opentelemetry/auto/instrumentation/reactor/TracingPublishers.java similarity index 100% rename from instrumentation/project-reactor-3.1/src/main/java8/io/opentelemetry/auto/instrumentation/reactor/TracingPublishers.java rename to instrumentation/reactor-3.1/src/main/java8/io/opentelemetry/auto/instrumentation/reactor/TracingPublishers.java diff --git a/instrumentation/project-reactor-3.1/src/main/java8/io/opentelemetry/auto/instrumentation/reactor/TracingSubscriber.java b/instrumentation/reactor-3.1/src/main/java8/io/opentelemetry/auto/instrumentation/reactor/TracingSubscriber.java similarity index 100% rename from instrumentation/project-reactor-3.1/src/main/java8/io/opentelemetry/auto/instrumentation/reactor/TracingSubscriber.java rename to instrumentation/reactor-3.1/src/main/java8/io/opentelemetry/auto/instrumentation/reactor/TracingSubscriber.java diff --git a/instrumentation/project-reactor-3.1/src/test/groovy/ReactorCoreTest.groovy b/instrumentation/reactor-3.1/src/test/groovy/ReactorCoreTest.groovy similarity index 100% rename from instrumentation/project-reactor-3.1/src/test/groovy/ReactorCoreTest.groovy rename to instrumentation/reactor-3.1/src/test/groovy/ReactorCoreTest.groovy diff --git a/instrumentation/spring-webflux-5.0/spring-webflux-5.0.gradle b/instrumentation/spring-webflux-5.0/spring-webflux-5.0.gradle index 50781ca7620e..3e65a4387671 100644 --- a/instrumentation/spring-webflux-5.0/spring-webflux-5.0.gradle +++ b/instrumentation/spring-webflux-5.0/spring-webflux-5.0.gradle @@ -35,7 +35,7 @@ dependencies { testCompile project(':instrumentation:trace-annotation') testCompile project(':instrumentation:netty:netty-4.1') - testCompile project(':instrumentation:project-reactor-3.1') + testCompile project(':instrumentation:reactor-3.1') testCompile group: 'org.springframework.boot', name: 'spring-boot-starter-webflux', version: '2.0.0.RELEASE' testCompile group: 'org.springframework.boot', name: 'spring-boot-starter-test', version: '2.0.0.RELEASE' diff --git a/settings.gradle b/settings.gradle index 8e887c1b49ed..07e0051aec92 100644 --- a/settings.gradle +++ b/settings.gradle @@ -128,7 +128,7 @@ include ':instrumentation:play-ws:play-ws-2.1' include ':instrumentation:play-ws:play-ws-common' include ':instrumentation:rabbitmq-2.7' include ':instrumentation:ratpack-1.5' -include ':instrumentation:project-reactor-3.1' +include ':instrumentation:reactor-3.1' include ':instrumentation:rediscala-1.8' include ':instrumentation:rmi' include ':instrumentation:rxjava-1.0'