Use normal filesystem-based Gradle paths. (#2332)

* Use normal filesystem-based Gradle paths.

* Update workflow by making agnostic to jacoco project name

* More merge

.github/workflows/master-build.yml

@@ -36,7 +36,7 @@ jobs:
       - uses: burrunan/gradle-cache-action@v1.6
         with:
           remote-build-cache-proxy-enabled: false
-          arguments: build --stacktrace ${{ matrix.coverage && ':opentelemetry-all:jacocoTestReport' || '' }}
+          arguments: build --stacktrace ${{ matrix.coverage && 'jacocoTestReport' || '' }}
           properties: |
             testAdditionalJavaVersions=${{ matrix.testAdditionalJavaVersions }}
             org.gradle.java.installations.paths=${{ steps.setup-java-8.outputs.path }},${{ steps.setup-java-11.outputs.path }}

.github/workflows/pr-build.yml

@@ -36,7 +36,7 @@ jobs:
       - uses: burrunan/gradle-cache-action@v1.6
         with:
           remote-build-cache-proxy-enabled: false
-          arguments: build --stacktrace ${{ matrix.coverage && ':opentelemetry-all:jacocoTestReport' || '' }}
+          arguments: build --stacktrace ${{ matrix.coverage && 'jacocoTestReport' || '' }}
           properties: |
             testAdditionalJavaVersions=${{ matrix.testAdditionalJavaVersions }}
             org.gradle.java.installations.paths=${{ steps.setup-java-8.outputs.path }},${{ steps.setup-java-11.outputs.path }}

api/all/build.gradle

@@ -8,12 +8,13 @@ plugins {
 
 description = 'OpenTelemetry API'
 ext.moduleName = "io.opentelemetry.api"
+archivesBaseName = "opentelemetry-api"
 
 dependencies {
-    api project(':opentelemetry-context'),
-            project(':opentelemetry-api-baggage'),
-            project(':opentelemetry-api-common'),
-            project(':opentelemetry-api-trace')
+    api project(':api:context'),
+            project(':api:baggage'),
+            project(':api:common'),
+            project(':api:trace')
 
     annotationProcessor libraries.auto_value
 

api/baggage/build.gradle

@@ -10,8 +10,8 @@ description = 'OpenTelemetry API'
 ext.moduleName = "io.opentelemetry.api"
 
 dependencies {
-    api project(':opentelemetry-context'),
-            project(':opentelemetry-api-common')
+    api project(':api:context'),
+            project(':api:common')
 
     annotationProcessor libraries.auto_value
 

api/build.gradle

@@ -0,0 +1,7 @@
+subprojects {
+    // Workaround https://github.com/gradle/gradle/issues/847
+    group = "io.opentelemetry.api"
+    plugins.withId("java") {
+        archivesBaseName = "opentelemetry-api-${project.name}"
+    }
+}

api/context/build.gradle

@@ -9,6 +9,7 @@ plugins {
 
 description = "OpenTelemetry Context (Incubator)"
 ext.moduleName = "io.opentelemetry.context"
+archivesBaseName = "opentelemetry-context"
 
 testSets {
     grpcInOtelTest

api/metrics/build.gradle

@@ -10,8 +10,8 @@ description = 'OpenTelemetry API'
 ext.moduleName = "io.opentelemetry.api.metrics"
 
 dependencies {
-    api project(':opentelemetry-context'),
-            project(':opentelemetry-api-common')
+    api project(':api:context'),
+            project(':api:common')
 
     annotationProcessor libraries.auto_value
 

api/trace/build.gradle

@@ -10,8 +10,8 @@ description = 'OpenTelemetry API'
 ext.moduleName = "io.opentelemetry.api.trace"
 
 dependencies {
-    api project(':opentelemetry-context'),
-            project(':opentelemetry-api-common')
+    api project(':api:context'),
+            project(':api:common')
 
     annotationProcessor libraries.auto_value
 

bom/build.gradle

@@ -6,15 +6,18 @@ plugins {
 description = 'OpenTelemetry Bill of Materials'
 group = "io.opentelemetry"
 
-dependencies {
-    constraints {
-        parent.childProjects.sort { "$it.value" }
-                .collect { it.value }
-                .findAll { it.name != project.name }
-                .findAll { !it.name.endsWith('-metrics') }
-                .each { project ->
-                    api project
-                    println project
-                }
+afterEvaluate {
+    dependencies {
+        constraints {
+            rootProject.subprojects.sort { "$it.archivesBaseName" }
+                    .collect { it }
+                    .findAll { it.name != project.name }
+                    .findAll { !it.name.endsWith('metrics') }
+                    .each { project ->
+                        project.plugins.withId("maven-publish") {
+                            api project
+                        }
+                    }
+        }
     }
-}
+}

build.gradle

@@ -50,6 +50,8 @@ subprojects {
         plugins.apply('com.diffplug.spotless')
         plugins.apply('net.ltgt.errorprone')
 
+        archivesBaseName = "opentelemetry-${project.name}"
+
         repositories {
             mavenCentral()
             jcenter()
@@ -432,10 +434,13 @@ subprojects {
         publishing {
             publications {
                 mavenPublication(MavenPublication) {
-                    version project.name.endsWith('-metrics') ? "${version}".replaceFirst(/^(\d+)\.(\d+).(\d+)/) { _, major, minor, patch ->
+                    version project.name.endsWith('metrics') ? "${version}".replaceFirst(/^(\d+)\.(\d+).(\d+)/) { _, major, minor, patch ->
                             "${major}.${minor}.${patch}-alpha"
                         } : version
-                    groupId group
+                    groupId "io.opentelemetry"
+                    afterEvaluate {
+                        artifactId = archivesBaseName
+                    }
 
                     plugins.withId("java-platform") {
                         from(components["javaPlatform"])

exporters/build.gradle

@@ -0,0 +1,7 @@
+subprojects {
+    // https://github.com/gradle/gradle/issues/847
+    group = "io.opentelemetry.exporters"
+    plugins.withId("java") {
+        archivesBaseName = "opentelemetry-exporter-${project.name}"
+    }
+}

exporters/jaeger-thrift/build.gradle

@@ -9,16 +9,16 @@ description = 'OpenTelemetry - Jaeger Thrift Exporter'
 ext.moduleName = "io.opentelemetry.exporter.jaeger.thrift"
 
 dependencies {
-    api project(':opentelemetry-sdk')
+    api project(':sdk:all')
 
-    implementation project(':opentelemetry-sdk'),
+    implementation project(':sdk:all'),
             libraries.jaeger_client
 
     testImplementation 'com.fasterxml.jackson.core:jackson-databind',
             libraries.testcontainers,
             libraries.okhttp
 
-    testImplementation project(':opentelemetry-sdk-testing')
+    testImplementation project(':sdk:testing')
 
     signature libraries.android_signature
 }

exporters/jaeger/build.gradle

@@ -10,11 +10,11 @@ description = 'OpenTelemetry - Jaeger Exporter'
 ext.moduleName = "io.opentelemetry.exporter.jaeger"
 
 dependencies {
-    api project(':opentelemetry-sdk'),
+    api project(':sdk:all'),
             libraries.grpc_api
 
-    implementation project(':opentelemetry-sdk-extension-otproto'),
-            project(':opentelemetry-sdk'),
+    implementation project(':sdk-extensions:otproto'),
+            project(':sdk:all'),
             libraries.grpc_protobuf,
             libraries.grpc_stub,
             libraries.protobuf,
@@ -25,7 +25,7 @@ dependencies {
             libraries.testcontainers,
             libraries.okhttp
 
-    testImplementation project(':opentelemetry-sdk-testing')
+    testImplementation project(':sdk:testing')
 
     // Protobuf plugin seems to erroneously use the non-classpath configurations for resolving
     // dependencies.

exporters/logging/build.gradle

@@ -9,9 +9,9 @@ description = 'OpenTelemetry - Logging Exporter'
 ext.moduleName = "io.opentelemetry.exporter.logging"
 
 dependencies {
-    api project(':opentelemetry-sdk')
+    api project(':sdk:all')
 
-    testImplementation project(':opentelemetry-sdk-testing')
+    testImplementation project(':sdk:testing')
 
     signature libraries.android_signature
 }

exporters/otlp/all/build.gradle

@@ -8,7 +8,8 @@ plugins {
 
 description = 'OpenTelemetry Protocol Exporters'
 ext.moduleName = "io.opentelemetry.exporter.otlp"
+archivesBaseName = "opentelemetry-exporter-otlp"
 
 dependencies {
-    api project(':opentelemetry-exporter-otlp-trace')
+    api project(':exporters:otlp:trace')
 }

exporters/otlp/build.gradle

@@ -0,0 +1,5 @@
+subprojects {
+    plugins.withId("java") {
+        archivesBaseName = "opentelemetry-exporter-otlp-${project.name}"
+    }
+}

exporters/otlp/metrics/build.gradle

@@ -13,15 +13,15 @@ version = "${version}".replaceFirst(/^(\d+)\.(\d+).(\d+)/) { _, major, minor, pa
 }
 
 dependencies {
-    api project(':opentelemetry-sdk')
+    api project(':sdk:all')
 
-    implementation project(':opentelemetry-sdk-extension-otproto'),
+    implementation project(':sdk-extensions:otproto'),
             libraries.grpc_api,
             libraries.grpc_protobuf,
             libraries.grpc_stub,
             libraries.protobuf
 
-    testImplementation project(':opentelemetry-sdk-testing')
+    testImplementation project(':sdk:testing')
 
     testImplementation "io.grpc:grpc-testing:${grpcVersion}"
     testRuntime "io.grpc:grpc-netty-shaded:${grpcVersion}"

exporters/otlp/trace/build.gradle

@@ -10,22 +10,22 @@ description = 'OpenTelemetry Protocol Trace Exporter'
 ext.moduleName = "io.opentelemetry.exporter.otlp.trace"
 
 dependencies {
-    api project(':opentelemetry-sdk')
+    api project(':sdk:all')
 
-    implementation project(':opentelemetry-sdk-extension-otproto'),
+    implementation project(':sdk-extensions:otproto'),
             libraries.grpc_api,
             libraries.grpc_protobuf,
             libraries.grpc_stub,
             libraries.protobuf
 
-    testImplementation project(':opentelemetry-sdk-testing'),
+    testImplementation project(':sdk:testing'),
             'com.linecorp.armeria:armeria-grpc',
             'com.linecorp.armeria:armeria-junit5',
             "io.grpc:grpc-testing:${grpcVersion}"
 
     testRuntime "io.grpc:grpc-netty-shaded:${grpcVersion}"
 
-    jmh project(':opentelemetry-sdk-testing')
+    jmh project(':sdk:testing')
 
     signature libraries.android_signature
 }

exporters/prometheus/build.gradle

@@ -9,7 +9,7 @@ description = 'OpenTelemetry Prometheus Exporter'
 ext.moduleName = "io.opentelemetry.exporter.prometheus"
 
 dependencies {
-    api project(':opentelemetry-sdk')
+    api project(':sdk:all')
 
     implementation libraries.prometheus_client
 

exporters/zipkin/build.gradle

@@ -11,14 +11,14 @@ ext.moduleName = "io.opentelemetry.exporter.zipkin"
 dependencies {
     compileOnly libraries.auto_value
 
-    api project(':opentelemetry-sdk')
+    api project(':sdk:all')
 
     annotationProcessor libraries.auto_value
 
     implementation libraries.zipkin_reporter,
             libraries.zipkin_okhttp
 
-    testImplementation project(':opentelemetry-sdk-testing')
+    testImplementation project(':sdk:testing')
     testImplementation libraries.guava,
             libraries.zipkin_junit
 

extensions/annotations/build.gradle

@@ -9,5 +9,5 @@ description = 'OpenTelemetry Extension Annotations'
 ext.moduleName = "io.opentelemetry.extension.annotations"
 
 dependencies {
-    api project(':opentelemetry-api')
+    api project(':api:all')
 }

extensions/build.gradle

@@ -0,0 +1,5 @@
+subprojects {
+    plugins.withId("java") {
+        archivesBaseName = "opentelemetry-extension-${project.name}"
+    }
+}

extensions/kotlin/build.gradle

@@ -13,12 +13,12 @@ ext.moduleName = "io.opentelemetry.extension.kotlin"
 dependencies {
     implementation(platform("org.jetbrains.kotlin:kotlin-bom"))
 
-    api project(':opentelemetry-api')
+    api project(':api:all')
 
     api("org.jetbrains.kotlin:kotlin-stdlib-common")
     api("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.4.1")
 
-    testImplementation project(':opentelemetry-sdk-testing')
+    testImplementation project(':sdk:testing')
     testImplementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8")
 
     signature libraries.android_signature

extensions/trace-propagators/build.gradle

@@ -10,7 +10,7 @@ description = 'OpenTelemetry Extension : Trace Propagators'
 ext.moduleName = "io.opentelemetry.extension.trace.propagation"
 
 dependencies {
-    api project(':opentelemetry-api')
+    api project(':api:all')
 
     testImplementation libraries.jaeger_client,
             libraries.guava

integration-tests/build.gradle

@@ -14,8 +14,8 @@ task fatJar(type: Jar) {
 }
 
 dependencies {
-    implementation project(':opentelemetry-sdk'),
-            project(':opentelemetry-exporter-jaeger'),
+    implementation project(':sdk:all'),
+            project(':exporters:jaeger'),
             libraries.grpc_protobuf,
             libraries.protobuf,
             "io.grpc:grpc-netty-shaded:${grpcVersion}"

integration-tests/tracecontext/build.gradle

@@ -17,8 +17,8 @@ task fatJar(type: Jar) {
 }
 
 dependencies {
-    implementation project(':opentelemetry-sdk'),
-            project(':opentelemetry-extension-trace-propagators'),
+    implementation project(':sdk:all'),
+            project(':extensions:trace-propagators'),
             libraries.okhttp,
             libraries.slf4jsimple,
             "com.sparkjava:spark-core:2.9.3",

opencensus-shim/build.gradle

@@ -7,13 +7,13 @@ description = 'OpenTelemetry OpenCensus Shim'
 ext.moduleName = "io.opentelemetry.opencensusshim"
 
 dependencies {
-    api project(':opentelemetry-api'),
-            project(':opentelemetry-sdk'),
+    api project(':api:all'),
+            project(':sdk:all'),
             libraries.opencensus_api,
             libraries.opencensus_impl_core,
             libraries.opencensus_metric_exporter
 
-    testImplementation project(':opentelemetry-sdk'),
+    testImplementation project(':sdk:all'),
             libraries.junit,
             libraries.assertj,
             libraries.slf4jsimple,

opentracing-shim/build.gradle

@@ -7,10 +7,10 @@ description = 'OpenTelemetry OpenTracing Bridge'
 ext.moduleName = "io.opentelemetry.opentracingshim"
 
 dependencies {
-    api project(':opentelemetry-api'),
+    api project(':api:all'),
             libraries.opentracing
 
-    testImplementation project(':opentelemetry-sdk-testing'),
+    testImplementation project(':sdk:testing'),
             libraries.junit,
             libraries.assertj,
             libraries.slf4jsimple

perf-harness/build.gradle

@@ -6,11 +6,11 @@ description = 'Performance Testing Harness'
 ext.moduleName = "io.opentelemetry.perf-harness"
 
 dependencies {
-    compile project(':opentelemetry-api'),
-            project(":opentelemetry-sdk"),
-            project(":opentelemetry-sdk-testing"),
-            project(":opentelemetry-exporter-otlp-trace"),
-            project(":opentelemetry-exporter-logging")
+    compile project(':api:all'),
+            project(":sdk:all"),
+            project(":sdk:testing"),
+            project(":exporters:otlp:trace"),
+            project(":exporters:logging")
 
     compile("io.grpc:grpc-netty-shaded")
     compile("eu.rekawek.toxiproxy:toxiproxy-java:2.1.4")

sdk-extensions/async-processor/build.gradle

@@ -9,8 +9,8 @@ description = 'OpenTelemetry SDK Extension: Async SpanProcessor'
 ext.moduleName = "io.opentelemetry.sdk.extension.trace.export"
 
 dependencies {
-    api project(':opentelemetry-api'),
-            project(':opentelemetry-sdk')
+    api project(':api:all'),
+            project(':sdk:all')
 
     implementation libraries.guava,
             libraries.disruptor

sdk-extensions/aws/build.gradle

@@ -10,8 +10,8 @@ description = 'OpenTelemetry SDK AWS Instrumentation Support'
 ext.moduleName = "io.opentelemetry.sdk.extension.trace.aws"
 
 dependencies {
-    api project(':opentelemetry-api'),
-            project(':opentelemetry-sdk')
+    api project(':api:all'),
+            project(':sdk:all')
 
     implementation 'com.fasterxml.jackson.core:jackson-core'
     implementation 'com.fasterxml.jackson.core:jackson-databind'

sdk-extensions/jaeger-remote-sampler/build.gradle

@@ -10,10 +10,10 @@ description = 'OpenTelemetry - Jaeger Remote sampler'
 ext.moduleName = "io.opentelemetry.sdk.extension.trace.jaeger"
 
 dependencies {
-    api project(':opentelemetry-sdk')
+    api project(':sdk:all')
 
-    implementation project(':opentelemetry-sdk-extension-otproto'),
-            project(':opentelemetry-sdk'),
+    implementation project(':sdk-extensions:otproto'),
+            project(':sdk:all'),
             libraries.grpc_api,
             libraries.grpc_protobuf,
             libraries.grpc_stub,

sdk-extensions/jfr-events/build.gradle

@@ -6,8 +6,8 @@ description = 'OpenTelemetry SDK Extension JFR'
 ext.moduleName = 'io.opentelemetry.sdk.extension.jfr'
 
 dependencies {
-    implementation project(':opentelemetry-api'),
-            project(':opentelemetry-sdk')
+    implementation project(':api:all'),
+            project(':sdk:all')
 }
 
 tasks.withType(JavaCompile) {

sdk-extensions/logging/build.gradle

@@ -9,7 +9,7 @@ description = 'OpenTelemetry Contrib Logging Support'
 ext.moduleName = "io.opentelemetry.sdk.extension.logging"
 
 dependencies {
-    api project(':opentelemetry-sdk')
+    api project(':sdk:all')
     implementation group: 'com.fasterxml.jackson.core', name: 'jackson-databind'
     testImplementation libraries.awaitility
 

sdk-extensions/otproto/build.gradle

@@ -9,13 +9,13 @@ description = 'OpenTelemetry Protocol Exporter'
 ext.moduleName = "io.opentelemetry.exporters.otprotocol"
 
 dependencies {
-    api project(':opentelemetry-api'),
-            project(':opentelemetry-proto'),
-            project(':opentelemetry-sdk')
+    api project(':api:all'),
+            project(':proto'),
+            project(':sdk:all')
 
     implementation libraries.protobuf
 
-    testImplementation project(':opentelemetry-sdk-testing')
+    testImplementation project(':sdk:testing')
 
     testImplementation "io.grpc:grpc-testing:${grpcVersion}"
     testRuntime "io.grpc:grpc-netty-shaded:${grpcVersion}"

sdk-extensions/resources/build.gradle

@@ -9,7 +9,7 @@ description = 'OpenTelemetry SDK Resource Providers'
 ext.moduleName = "io.opentelemetry.sdk.extension.resources"
 
 dependencies {
-    api project(':opentelemetry-sdk-common')
+    api project(':sdk:common')
 
     testImplementation libraries.junit_pioneer
 

sdk-extensions/tracing-incubator/build.gradle

@@ -11,12 +11,12 @@ description = 'OpenTelemetry SDK Tracing Incubator'
 ext.moduleName = "io.opentelemetry.sdk.extension.trace.incubator"
 
 dependencies {
-    api project(':opentelemetry-api'),
-            project(':opentelemetry-sdk')
+    api project(':api:all'),
+            project(':sdk:all')
 
 
     annotationProcessor libraries.auto_value
-    testImplementation project(':opentelemetry-sdk-testing'),
+    testImplementation project(':sdk:testing'),
             libraries.guava_testlib
 
     signature libraries.android_signature

sdk-extensions/zpages/build.gradle

@@ -10,8 +10,8 @@ description = 'OpenTelemetry - zPages'
 ext.moduleName = "io.opentelemetry.sdk.extension.zpages"
 
 dependencies {
-    implementation project(':opentelemetry-api'),
-            project(':opentelemetry-sdk')
+    implementation project(':api:all'),
+            project(':sdk:all')
 
     testImplementation libraries.guava
     

sdk/all/build.gradle

@@ -9,35 +9,36 @@ plugins {
 description = 'OpenTelemetry SDK'
 ext.moduleName = "io.opentelemetry.sdk"
 ext.propertiesDir = "build/generated/properties/io/opentelemetry/sdk"
+archivesBaseName = "opentelemetry-sdk"
 
 dependencies {
-    api project(':opentelemetry-api'),
-            project(':opentelemetry-sdk-common'),
-            project(':opentelemetry-sdk-metrics'),
-            project(':opentelemetry-sdk-trace')
+    api project(':api:all'),
+            project(':sdk:common'),
+            project(':sdk:metrics'),
+            project(':sdk:trace')
 
     annotationProcessor libraries.auto_value
 
     testAnnotationProcessor libraries.auto_value
     testCompileOnly libraries.auto_value_annotation
 
-    testImplementation project(':opentelemetry-sdk-testing')
+    testImplementation project(':sdk:testing')
     testImplementation libraries.junit_pioneer
 
-    jmh(project(':opentelemetry-sdk-testing')) {
+    jmh(project(':sdk:testing')) {
         // JMH doesn't handle dependencies that are duplicated between the main and jmh
         // configurations properly, but luckily here it's simple enough to just exclude transitive
         // dependencies.
         transitive = false
     }
-    jmh(project(':opentelemetry-exporter-otlp-trace')) {
+    jmh(project(':exporters:otlp:trace')) {
         // The opentelemetry-exporter-otlp-trace depends on this project itself. So don't pull in
         // the transitive dependencies.
         transitive = false
     }
     // explicitly adding the opentelemetry-exporter-otlp dependencies
-    jmh(project(':opentelemetry-sdk-extension-otproto')) { transitive = false }
-    jmh(project(':opentelemetry-proto'))
+    jmh(project(':sdk-extensions:otproto')) { transitive = false }
+    jmh(project(':proto'))
     jmh("io.grpc:grpc-api")
     jmh("io.grpc:grpc-netty-shaded")
     jmh("org.testcontainers:testcontainers:1.15.0") // testContainer for OTLP collector

sdk/build.gradle

@@ -0,0 +1,7 @@
+subprojects {
+    // Workaround https://github.com/gradle/gradle/issues/847
+    group = "io.opentelemetry.sdk"
+    plugins.withId("java") {
+        archivesBaseName = "opentelemetry-sdk-${project.name}"
+    }
+}

sdk/common/build.gradle

@@ -10,14 +10,14 @@ ext.moduleName = "io.opentelemetry.sdk.common"
 ext.propertiesDir = "build/generated/properties/io/opentelemetry/sdk/common"
 
 dependencies {
-    api project(':opentelemetry-api')
+    api project(':api:all')
 
     annotationProcessor libraries.auto_value
 
     testAnnotationProcessor libraries.auto_value
     testCompileOnly libraries.auto_value_annotation
 
-    testImplementation project(':opentelemetry-sdk-testing')
+    testImplementation project(':sdk:testing')
     testImplementation libraries.junit_pioneer,
             libraries.guava_testlib
 

sdk/metrics/build.gradle

@@ -11,18 +11,18 @@ ext.moduleName = "io.opentelemetry.sdk.metrics"
 ext.propertiesDir = "build/generated/properties/io/opentelemetry/sdk/metrics"
 
 dependencies {
-    api project(':opentelemetry-api-metrics'),
-            project(':opentelemetry-sdk-common')
+    api project(':api:metrics'),
+            project(':sdk:common')
 
     annotationProcessor libraries.auto_value
 
     testAnnotationProcessor libraries.auto_value
     testCompileOnly libraries.auto_value_annotation
 
-    testCompile project(path: ':opentelemetry-sdk-common', configuration: 'testClasses')
+    testCompile project(path: ':sdk:common', configuration: 'testClasses')
 
     testImplementation libraries.guava
-    testImplementation project(':opentelemetry-sdk-testing')
+    testImplementation project(':sdk:testing')
     testImplementation libraries.junit_pioneer
 
     signature libraries.android_signature

sdk/testing/build.gradle

@@ -7,8 +7,8 @@ description = 'OpenTelemetry SDK Testing utilities'
 ext.moduleName = 'io.opentelemetry.sdk.testing'
 
 dependencies {
-    api project(':opentelemetry-api')
-    api project(':opentelemetry-sdk')
+    api project(':api:all')
+    api project(':sdk:all')
 
     compileOnly libraries.assertj
     compileOnly libraries.junit

sdk/trace/build.gradle

@@ -11,20 +11,20 @@ ext.moduleName = "io.opentelemetry.sdk.trace"
 ext.propertiesDir = "build/generated/properties/io/opentelemetry/sdk/trace"
 
 dependencies {
-    api project(':opentelemetry-api-trace'),
-            project(':opentelemetry-sdk-common')
+    api project(':api:trace'),
+            project(':sdk:common')
 
-    implementation project(':opentelemetry-api-metrics')
+    implementation project(':api:metrics')
     
     annotationProcessor libraries.auto_value
 
     testAnnotationProcessor libraries.auto_value
     testCompileOnly libraries.auto_value_annotation
 
-    testCompile project(path: ':opentelemetry-sdk-common', configuration: 'testClasses')
+    testCompile project(path: ':sdk:common', configuration: 'testClasses')
 
     testImplementation libraries.guava
-    testImplementation project(':opentelemetry-sdk-testing')
+    testImplementation project(':sdk:testing')
     testImplementation libraries.junit_pioneer
 
     signature libraries.android_signature

settings.gradle

@@ -26,63 +26,44 @@ plugins {
 }
 
 rootProject.name = "opentelemetry-java"
-include ":opentelemetry-all",
-        ":opentelemetry-api",
-        ":opentelemetry-api-baggage",
-        ":opentelemetry-api-common",
-        ":opentelemetry-api-trace",
-        ":opentelemetry-api-metrics",
-        ":opentelemetry-context",
-        ":opentelemetry-extension-annotations",
-        ":opentelemetry-extension-kotlin",
-        ":opentelemetry-extension-trace-propagators",
-        ":opentelemetry-exporter-jaeger",
-        ":opentelemetry-exporter-jaeger-thrift",
-        ":opentelemetry-exporter-logging",
-        ":opentelemetry-exporter-otlp",
-        ":opentelemetry-exporter-otlp-metrics",
-        ":opentelemetry-exporter-otlp-trace",
-        ":opentelemetry-exporter-prometheus",
-        ":opentelemetry-exporter-zipkin",
-        ":opentelemetry-integration-tests",
-        ":opentelemetry-integration-tests-tracecontext",
-        ":opentelemetry-opencensus-shim",
-        ":opentelemetry-opentracing-shim",
-        ":opentelemetry-proto",
-        ":opentelemetry-sdk-common",
-        ":opentelemetry-sdk-metrics",
-        ":opentelemetry-sdk-trace",
-        ":opentelemetry-sdk",
-        ":opentelemetry-sdk-extension-async-processor",
-        ":opentelemetry-sdk-extension-aws",
-        ":opentelemetry-sdk-extension-logging",
-        ":opentelemetry-sdk-extension-otproto",
-        ":opentelemetry-sdk-extension-resources",
-        ":opentelemetry-sdk-extension-tracing-incubator",
-        ":opentelemetry-sdk-extension-jaeger-remote-sampler",
-        ":opentelemetry-sdk-extension-jfr-events",
-        ":opentelemetry-sdk-extension-zpages",
-        ":opentelemetry-sdk-testing",
-        ":opentelemetry-bom",
-        ":opentelemetry-perf-harness"
-
-rootProject.children.each {
-    it.projectDir = "$rootDir/" + it.name
-            .replace("opentelemetry-api-", "api/")
-            .replace("opentelemetry-integration-tests-", "integration-tests/")
-            .replace("opentelemetry-exporter-otlp-", "exporters/otlp/")
-            .replace("opentelemetry-exporter-", "exporters/")
-            .replace("opentelemetry-extension-", "extensions/")
-            .replace("opentelemetry-sdk-extension-", "sdk-extensions/")
-            .replace("opentelemetry-sdk-", "sdk/")
-            .replace("logging-", "logging/")
-            .replace("opentelemetry-", "") as File
-}
-
-project(":opentelemetry-api").projectDir = "$rootDir/api/all" as File
-project(":opentelemetry-context").projectDir = "$rootDir/api/context" as File
-project(":opentelemetry-exporter-otlp").projectDir = "$rootDir/exporters/otlp/all" as File
-project(":opentelemetry-sdk").projectDir = "$rootDir/sdk/all" as File
+include ":api:all",
+        ":api:context",
+        ":api:baggage",
+        ":api:common",
+        ":api:trace",
+        ":api:metrics",
+        ":bom",
+        ":extensions:annotations",
+        ":extensions:kotlin",
+        ":extensions:trace-propagators",
+        ":exporters:jaeger",
+        ":exporters:jaeger-thrift",
+        ":exporters:logging",
+        ":exporters:otlp:all",
+        ":exporters:otlp:metrics",
+        ":exporters:otlp:trace",
+        ":exporters:prometheus",
+        ":exporters:zipkin",
+        ":integration-tests",
+        ":integration-tests:tracecontext",
+        ":opencensus-shim",
+        ":opentracing-shim",
+        ":perf-harness",
+        ":proto",
+        ":sdk:all",
+        ":sdk:common",
+        ":sdk:metrics",
+        ":sdk:testing",
+        ":sdk:trace",
+        ":sdk-extensions:async-processor",
+        ":sdk-extensions:aws",
+        ":sdk-extensions:logging",
+        ":sdk-extensions:otproto",
+        ":sdk-extensions:resources",
+        ":sdk-extensions:tracing-incubator",
+        ":sdk-extensions:jaeger-remote-sampler",
+        ":sdk-extensions:jfr-events",
+        ":sdk-extensions:zpages"
 
 def isCI = System.getenv("CI") != null
 gradleEnterprise {