From f136531652ca79bf7b24ebd6fa3290e55664c3a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20Neum=C3=BCller?= Date: Fri, 10 Sep 2021 18:39:04 +0200 Subject: [PATCH 1/4] Make project names match artifact IDs. --- api/all/build.gradle.kts | 3 +- api/build.gradle.kts | 10 -- api/metrics/build.gradle.kts | 4 +- bom-alpha/build.gradle.kts | 6 +- bom/build.gradle.kts | 4 +- .../otel.japicmp-conventions.gradle.kts | 11 +- .../kotlin/otel.java-conventions.gradle.kts | 12 +- .../otel.publish-conventions.gradle.kts | 15 ++- context/build.gradle.kts | 2 +- .../ConfigureSpanProcessorExample.java | 5 + exporters/build.gradle.kts | 10 -- exporters/jaeger-thrift/build.gradle.kts | 8 +- exporters/jaeger/build.gradle.kts | 8 +- exporters/logging-otlp/build.gradle.kts | 10 +- exporters/logging/build.gradle.kts | 6 +- exporters/otlp-http/build.gradle.kts | 10 -- exporters/otlp-http/metrics/build.gradle.kts | 8 +- exporters/otlp-http/trace/build.gradle.kts | 8 +- exporters/otlp/all/build.gradle.kts | 3 +- exporters/otlp/build.gradle.kts | 10 -- exporters/otlp/common/build.gradle.kts | 20 ++-- exporters/otlp/metrics/build.gradle.kts | 8 +- exporters/otlp/trace/build.gradle.kts | 12 +- exporters/prometheus/build.gradle.kts | 2 +- exporters/zipkin/build.gradle.kts | 6 +- extensions/annotations/build.gradle.kts | 2 +- extensions/aws/build.gradle.kts | 4 +- extensions/build.gradle.kts | 8 -- extensions/incubator/build.gradle.kts | 4 +- extensions/kotlin/build.gradle.kts | 4 +- extensions/noop-api/build.gradle.kts | 2 +- extensions/trace-propagators/build.gradle.kts | 6 +- integration-tests/build.gradle.kts | 10 +- .../tracecontext/build.gradle.kts | 4 +- opencensus-shim/build.gradle.kts | 12 +- opentracing-shim/build.gradle.kts | 6 +- perf-harness/build.gradle.kts | 12 +- .../async-processor/build.gradle.kts | 4 +- .../autoconfigure-spi/build.gradle.kts | 2 +- sdk-extensions/autoconfigure/build.gradle.kts | 84 +++++++------- sdk-extensions/aws/build.gradle.kts | 12 +- sdk-extensions/build.gradle.kts | 8 -- .../jaeger-remote-sampler/build.gradle.kts | 10 +- sdk-extensions/jfr-events/build.gradle.kts | 4 +- sdk-extensions/logging/build.gradle.kts | 4 +- sdk-extensions/resources/build.gradle.kts | 6 +- .../tracing-incubator/build.gradle.kts | 20 ++-- sdk-extensions/zpages/build.gradle.kts | 6 +- sdk/all/build.gradle.kts | 8 +- sdk/build.gradle.kts | 10 -- sdk/common/build.gradle.kts | 8 +- .../sdk/resources/ResourceTest.java | 2 + sdk/metrics-testing/build.gradle.kts | 8 +- sdk/metrics/build.gradle.kts | 8 +- .../build.gradle.kts | 0 .../sdk/trace/internal/JcTools.java | 0 sdk/testing/build.gradle.kts | 6 +- sdk/trace/build.gradle.kts | 28 ++--- semconv/build.gradle.kts | 2 +- settings.gradle.kts | 109 +++++++++++------- 60 files changed, 293 insertions(+), 331 deletions(-) delete mode 100644 api/build.gradle.kts delete mode 100644 exporters/build.gradle.kts delete mode 100644 exporters/otlp-http/build.gradle.kts delete mode 100644 exporters/otlp/build.gradle.kts delete mode 100644 extensions/build.gradle.kts delete mode 100644 sdk-extensions/build.gradle.kts delete mode 100644 sdk/build.gradle.kts rename sdk/{trace-shaded-deps => sdk-trace-shaded-deps}/build.gradle.kts (100%) rename sdk/{trace-shaded-deps => sdk-trace-shaded-deps}/src/main/java/io/opentelemetry/sdk/trace/internal/JcTools.java (100%) diff --git a/api/all/build.gradle.kts b/api/all/build.gradle.kts index 54475d9fa5e..8d80a8b1663 100644 --- a/api/all/build.gradle.kts +++ b/api/all/build.gradle.kts @@ -8,10 +8,9 @@ plugins { description = "OpenTelemetry API" otelJava.moduleName.set("io.opentelemetry.api") -base.archivesBaseName = "opentelemetry-api" dependencies { - api(project(":context")) + api(project(":opentelemetry-context")) annotationProcessor("com.google.auto.value:auto-value") diff --git a/api/build.gradle.kts b/api/build.gradle.kts deleted file mode 100644 index fcb80201fdc..00000000000 --- a/api/build.gradle.kts +++ /dev/null @@ -1,10 +0,0 @@ -subprojects { - // Workaround https://github.com/gradle/gradle/issues/847 - group = "io.opentelemetry.api" - val proj = this - plugins.withId("java") { - configure { - archivesBaseName = "opentelemetry-api-${proj.name}" - } - } -} diff --git a/api/metrics/build.gradle.kts b/api/metrics/build.gradle.kts index 9acaf0dfec5..81885f930ea 100644 --- a/api/metrics/build.gradle.kts +++ b/api/metrics/build.gradle.kts @@ -10,8 +10,8 @@ description = "OpenTelemetry API" otelJava.moduleName.set("io.opentelemetry.api.metrics") dependencies { - api(project(":api:all")) - api(project(":context")) + api(project(":api:opentelemetry-api")) + api(project(":opentelemetry-context")) annotationProcessor("com.google.auto.value:auto-value") diff --git a/bom-alpha/build.gradle.kts b/bom-alpha/build.gradle.kts index 5f99807a0d6..90a0f67fa58 100644 --- a/bom-alpha/build.gradle.kts +++ b/bom-alpha/build.gradle.kts @@ -4,11 +4,9 @@ plugins { } description = "OpenTelemetry Bill of Materials (Alpha)" -group = "io.opentelemetry" -base.archivesBaseName = "opentelemetry-bom-alpha" rootProject.subprojects.forEach { subproject -> - if (!project.name.startsWith("bom")) { + if (!project.name.startsWith("opentelemetry-bom")) { evaluationDependsOn(subproject.path) } } @@ -18,7 +16,7 @@ afterEvaluate { constraints { rootProject.subprojects .sortedBy { it.findProperty("archivesBaseName") as String? } - .filter { !it.name.startsWith("bom") } + .filter { !it.name.startsWith("opentelemetry-bom") } .filter { it.findProperty("otel.release") == "alpha" } .forEach { project -> project.plugins.withId("maven-publish") { diff --git a/bom/build.gradle.kts b/bom/build.gradle.kts index 3e2d60e26f8..a5b6ce152eb 100644 --- a/bom/build.gradle.kts +++ b/bom/build.gradle.kts @@ -4,8 +4,6 @@ plugins { } description = "OpenTelemetry Bill of Materials" -group = "io.opentelemetry" -base.archivesBaseName = "opentelemetry-bom" rootProject.subprojects.forEach { subproject -> if (project != subproject) { @@ -18,7 +16,7 @@ afterEvaluate { constraints { rootProject.subprojects .sortedBy { it.findProperty("archivesBaseName") as String? } - .filter { !it.name.startsWith("bom") } + .filter { !it.name.startsWith("opentelemetry-bom") } .filter { !it.hasProperty("otel.release") } .forEach { project -> project.plugins.withId("maven-publish") { diff --git a/buildSrc/src/main/kotlin/otel.japicmp-conventions.gradle.kts b/buildSrc/src/main/kotlin/otel.japicmp-conventions.gradle.kts index 5c1662953f9..fff1e62c8c3 100644 --- a/buildSrc/src/main/kotlin/otel.japicmp-conventions.gradle.kts +++ b/buildSrc/src/main/kotlin/otel.japicmp-conventions.gradle.kts @@ -12,11 +12,13 @@ plugins { val latestReleasedVersion: String by lazy { // hack to find the current released version of the project val temp: Configuration = configurations.create("tempConfig") - // pick the api, since it's always there. - dependencies.add(temp.name, "io.opentelemetry:opentelemetry-api:latest.release") + // Pick the bom, since it's always there. Picking the api gives us the currently built version + // when executing this from the context of the api project. But we never compare the bom's API + // since there is none. + dependencies.add(temp.name, "io.opentelemetry:opentelemetry-bom:latest.release") val moduleVersion = configurations["tempConfig"].resolvedConfiguration.firstLevelModuleDependencies.elementAt(0).moduleVersion configurations.remove(temp) - logger.debug("Discovered latest release version: " + moduleVersion) + logger.info("Discovered latest release version: {}", moduleVersion) moduleVersion } @@ -43,7 +45,7 @@ fun findArtifact(version: String): File { } // generate the api diff report for any module that is stable and publishes a jar. -if (!project.hasProperty("otel.release") && !project.name.startsWith("bom")) { +if (!project.hasProperty("otel.release") && !project.name.startsWith("opentelemetry-bom")) { afterEvaluate { tasks { val jApiCmp by registering(JapicmpTask::class) { @@ -67,6 +69,7 @@ if (!project.hasProperty("otel.release") && !project.name.startsWith("bom")) { //if we can't find the baseline artifact, this is probably one that's never been published before, //so publish the whole API. We do that by flipping this flag, and comparing the current against nothing. isOnlyModified = false + logger.warn("Project is new because and old version couldn't be found: {}", e.toString()) files() } diff --git a/buildSrc/src/main/kotlin/otel.java-conventions.gradle.kts b/buildSrc/src/main/kotlin/otel.java-conventions.gradle.kts index 270f7b5a69b..0287c34c7e8 100644 --- a/buildSrc/src/main/kotlin/otel.java-conventions.gradle.kts +++ b/buildSrc/src/main/kotlin/otel.java-conventions.gradle.kts @@ -15,14 +15,6 @@ plugins { val otelJava = extensions.create("otelJava") -base { - // May be set already by a parent project, only set if not. - // TODO(anuraaga): Make this less hacky by creating a "module group" plugin. - if (!archivesName.get().startsWith("opentelemetry-")) { - archivesName.set("opentelemetry-${name}") - } -} - java { toolchain { languageVersion.set(JavaLanguageVersion.of(11)) @@ -64,7 +56,7 @@ tasks { } //disable deprecation warnings for the protobuf module - if (project.name == "proto") { + if (project.name == "opentelemetry-proto") { compilerArgs.add("-Xlint:-deprecation") } @@ -175,7 +167,7 @@ dependencies { dependencyManagement(platform(project(":dependencyManagement"))) afterEvaluate { configurations.configureEach { - if (isCanBeResolved && !isCanBeConsumed) { + if (!isCanBeConsumed && this != dependencyManagement) { extendsFrom(dependencyManagement) } } diff --git a/buildSrc/src/main/kotlin/otel.publish-conventions.gradle.kts b/buildSrc/src/main/kotlin/otel.publish-conventions.gradle.kts index 63f26e77a97..1e30f33705a 100644 --- a/buildSrc/src/main/kotlin/otel.publish-conventions.gradle.kts +++ b/buildSrc/src/main/kotlin/otel.publish-conventions.gradle.kts @@ -1,3 +1,5 @@ +import gradle.kotlin.dsl.accessors._33c50961cbf9e9e490400740be7b5d25.base + plugins { `maven-publish` signing @@ -5,6 +7,17 @@ plugins { id("otel.japicmp-conventions") } +base { + // May be set already by a parent project, only set if not. + // TODO(anuraaga): Make this less hacky by creating a "module group" plugin. + if (!project.name.startsWith("opentelemetry-")) { + throw Error("archivesName of ${project.path} should start with opentelemetry-") + } +} + +// We must not change group ID or artifact ID here, otherwise composite builds won't work. +// Ensure that the project name matches the expected artifact ID. + publishing { publications { register("mavenPublication") { @@ -14,10 +27,8 @@ publishing { versionParts[0] += "-${release}" version = versionParts.joinToString("-") } - groupId = "io.opentelemetry" afterEvaluate { // not available until evaluated. - artifactId = base.archivesName.get() pom.description.set(project.description) } diff --git a/context/build.gradle.kts b/context/build.gradle.kts index 4a82a5b374c..4ff32e91b55 100644 --- a/context/build.gradle.kts +++ b/context/build.gradle.kts @@ -31,7 +31,7 @@ dependencies { add("otelAsBraveTestImplementation", "io.zipkin.brave:brave") add("otelInBraveTestImplementation", "io.zipkin.brave:brave") - add("strictContextEnabledTestImplementation", project(":api:all")) + add("strictContextEnabledTestImplementation", project(":api:opentelemetry-api")) // MustBeClosed compileOnly("com.google.errorprone:error_prone_annotations") diff --git a/examples/sdk-usage/src/main/java/io/opentelemetry/sdk/example/ConfigureSpanProcessorExample.java b/examples/sdk-usage/src/main/java/io/opentelemetry/sdk/example/ConfigureSpanProcessorExample.java index 63fe3c6eaa6..0feb2c9a02e 100644 --- a/examples/sdk-usage/src/main/java/io/opentelemetry/sdk/example/ConfigureSpanProcessorExample.java +++ b/examples/sdk-usage/src/main/java/io/opentelemetry/sdk/example/ConfigureSpanProcessorExample.java @@ -5,9 +5,11 @@ package io.opentelemetry.sdk.example; +import io.opentelemetry.api.common.AttributeKey; import io.opentelemetry.api.trace.Tracer; import io.opentelemetry.exporter.logging.LoggingSpanExporter; import io.opentelemetry.sdk.OpenTelemetrySdk; +import io.opentelemetry.sdk.resources.Resource; import io.opentelemetry.sdk.trace.SdkTracerProvider; import io.opentelemetry.sdk.trace.SpanProcessor; import io.opentelemetry.sdk.trace.export.BatchSpanProcessor; @@ -25,6 +27,9 @@ public final class ConfigureSpanProcessorExample { private static final Tracer tracer = openTelemetry.getTracer("ConfigureSpanProcessorExample"); public static void main(String[] args) { + System.out.println( + Resource.getDefault().getAttribute(AttributeKey.stringKey("telemetry.sdk.version"))); + // Example how to configure the default SpanProcessors. defaultSpanProcessors(); // After this method, the following SpanProcessors are registered: diff --git a/exporters/build.gradle.kts b/exporters/build.gradle.kts deleted file mode 100644 index 3fb5519add2..00000000000 --- a/exporters/build.gradle.kts +++ /dev/null @@ -1,10 +0,0 @@ -subprojects { - // https://github.com/gradle/gradle/issues/847 - group = "io.opentelemetry.exporters" - val proj = this - plugins.withId("java") { - configure { - archivesBaseName = "opentelemetry-exporter-${proj.name}" - } - } -} diff --git a/exporters/jaeger-thrift/build.gradle.kts b/exporters/jaeger-thrift/build.gradle.kts index 266ee0232ab..9a7670eaa9f 100644 --- a/exporters/jaeger-thrift/build.gradle.kts +++ b/exporters/jaeger-thrift/build.gradle.kts @@ -9,10 +9,10 @@ description = "OpenTelemetry - Jaeger Thrift Exporter" otelJava.moduleName.set("io.opentelemetry.exporter.jaeger.thrift") dependencies { - api(project(":sdk:all")) + api(project(":sdk:opentelemetry-sdk")) - implementation(project(":sdk:all")) - implementation(project(":semconv")) + implementation(project(":sdk:opentelemetry-sdk")) + implementation(project(":opentelemetry-semconv")) implementation("io.jaegertracing:jaeger-client") @@ -21,5 +21,5 @@ dependencies { testImplementation("com.squareup.okhttp3:okhttp") testImplementation("com.google.guava:guava-testlib") - testImplementation(project(":sdk:testing")) + testImplementation(project(":sdk:opentelemetry-sdk-testing")) } diff --git a/exporters/jaeger/build.gradle.kts b/exporters/jaeger/build.gradle.kts index aec1cac1e42..0dc52b1c365 100644 --- a/exporters/jaeger/build.gradle.kts +++ b/exporters/jaeger/build.gradle.kts @@ -9,11 +9,11 @@ description = "OpenTelemetry - Jaeger Exporter" otelJava.moduleName.set("io.opentelemetry.exporter.jaeger") dependencies { - api(project(":sdk:all")) + api(project(":sdk:opentelemetry-sdk")) api("io.grpc:grpc-api") - implementation(project(":sdk:all")) - implementation(project(":semconv")) + implementation(project(":sdk:opentelemetry-sdk")) + implementation(project(":opentelemetry-semconv")) implementation("io.grpc:grpc-protobuf") implementation("io.grpc:grpc-stub") @@ -26,7 +26,7 @@ dependencies { testImplementation("com.google.protobuf:protobuf-java-util") testImplementation("com.squareup.okhttp3:okhttp") - testImplementation(project(":sdk:testing")) + testImplementation(project(":sdk:opentelemetry-sdk-testing")) testRuntimeOnly("io.grpc:grpc-netty-shaded") } diff --git a/exporters/logging-otlp/build.gradle.kts b/exporters/logging-otlp/build.gradle.kts index b73dc5cc371..a189d93e9df 100644 --- a/exporters/logging-otlp/build.gradle.kts +++ b/exporters/logging-otlp/build.gradle.kts @@ -9,15 +9,15 @@ description = "OpenTelemetry Protocol JSON Logging Exporters" otelJava.moduleName.set("io.opentelemetry.exporter.logging.otlp") dependencies { - compileOnly(project(":sdk:trace")) - compileOnly(project(":sdk:metrics")) + compileOnly(project(":sdk:opentelemetry-sdk-trace")) + compileOnly(project(":sdk:opentelemetry-sdk-metrics")) - implementation(project(":exporters:otlp:common")) - implementation(project(":proto")) + implementation(project(":exporters:otlp:opentelemetry-exporter-otlp-common")) + implementation(project(":opentelemetry-proto")) implementation("org.curioswitch.curiostack:protobuf-jackson") - testImplementation(project(":sdk:testing")) + testImplementation(project(":sdk:opentelemetry-sdk-testing")) testImplementation("org.skyscreamer:jsonassert") } diff --git a/exporters/logging/build.gradle.kts b/exporters/logging/build.gradle.kts index ddf4d9de0c0..b73293a7556 100644 --- a/exporters/logging/build.gradle.kts +++ b/exporters/logging/build.gradle.kts @@ -9,8 +9,8 @@ description = "OpenTelemetry - Logging Exporter" otelJava.moduleName.set("io.opentelemetry.exporter.logging") dependencies { - api(project(":sdk:all")) - api(project(":sdk:metrics")) + api(project(":sdk:opentelemetry-sdk")) + api(project(":sdk:opentelemetry-sdk-metrics")) - testImplementation(project(":sdk:testing")) + testImplementation(project(":sdk:opentelemetry-sdk-testing")) } diff --git a/exporters/otlp-http/build.gradle.kts b/exporters/otlp-http/build.gradle.kts deleted file mode 100644 index 8634de9ae94..00000000000 --- a/exporters/otlp-http/build.gradle.kts +++ /dev/null @@ -1,10 +0,0 @@ -subprojects { - // Workaround https://github.com/gradle/gradle/issues/847 - group = "io.opentelemetry.exporter.otlp.http" - val proj = this - plugins.withId("java") { - configure { - archivesBaseName = "opentelemetry-exporter-otlp-http-${proj.name}" - } - } -} diff --git a/exporters/otlp-http/metrics/build.gradle.kts b/exporters/otlp-http/metrics/build.gradle.kts index 23ec56a402f..e69a11d8844 100644 --- a/exporters/otlp-http/metrics/build.gradle.kts +++ b/exporters/otlp-http/metrics/build.gradle.kts @@ -9,16 +9,16 @@ description = "OpenTelemetry Protocol HTTP Metrics Exporter" otelJava.moduleName.set("io.opentelemetry.exporter.otlp.http.metrics") dependencies { - api(project(":sdk:metrics")) + api(project(":sdk:opentelemetry-sdk-metrics")) - implementation(project(":exporters:otlp:common")) + implementation(project(":exporters:otlp:opentelemetry-exporter-otlp-common")) implementation("com.squareup.okhttp3:okhttp") implementation("com.squareup.okhttp3:okhttp-tls") implementation("com.squareup.okio:okio") - testImplementation(project(":proto")) - testImplementation(project(":sdk:testing")) + testImplementation(project(":opentelemetry-proto")) + testImplementation(project(":sdk:opentelemetry-sdk-testing")) testImplementation("com.google.api.grpc:proto-google-common-protos") testImplementation("com.linecorp.armeria:armeria-junit5") diff --git a/exporters/otlp-http/trace/build.gradle.kts b/exporters/otlp-http/trace/build.gradle.kts index 22b702414e9..0aa661c5956 100644 --- a/exporters/otlp-http/trace/build.gradle.kts +++ b/exporters/otlp-http/trace/build.gradle.kts @@ -9,16 +9,16 @@ description = "OpenTelemetry Protocol HTTP Trace Exporter" otelJava.moduleName.set("io.opentelemetry.exporter.otlp.http.trace") dependencies { - api(project(":sdk:trace")) + api(project(":sdk:opentelemetry-sdk-trace")) - implementation(project(":exporters:otlp:common")) + implementation(project(":exporters:otlp:opentelemetry-exporter-otlp-common")) implementation("com.squareup.okhttp3:okhttp") implementation("com.squareup.okhttp3:okhttp-tls") implementation("com.squareup.okio:okio") - testImplementation(project(":proto")) - testImplementation(project(":sdk:testing")) + testImplementation(project(":opentelemetry-proto")) + testImplementation(project(":sdk:opentelemetry-sdk-testing")) testImplementation("com.google.api.grpc:proto-google-common-protos") testImplementation("com.linecorp.armeria:armeria-junit5") diff --git a/exporters/otlp/all/build.gradle.kts b/exporters/otlp/all/build.gradle.kts index 7849b991875..bf3ee103942 100644 --- a/exporters/otlp/all/build.gradle.kts +++ b/exporters/otlp/all/build.gradle.kts @@ -8,8 +8,7 @@ plugins { description = "OpenTelemetry Protocol Exporters" otelJava.moduleName.set("io.opentelemetry.exporter.otlp") -base.archivesBaseName = "opentelemetry-exporter-otlp" dependencies { - api(project(":exporters:otlp:trace")) + api(project(":exporters:otlp:opentelemetry-exporter-otlp-trace")) } diff --git a/exporters/otlp/build.gradle.kts b/exporters/otlp/build.gradle.kts deleted file mode 100644 index 58ee126d0c3..00000000000 --- a/exporters/otlp/build.gradle.kts +++ /dev/null @@ -1,10 +0,0 @@ -subprojects { - // Workaround https://github.com/gradle/gradle/issues/847 - group = "io.opentelemetry.exporter.otlp" - val proj = this - plugins.withId("java") { - configure { - archivesBaseName = "opentelemetry-exporter-otlp-${proj.name}" - } - } -} diff --git a/exporters/otlp/common/build.gradle.kts b/exporters/otlp/common/build.gradle.kts index 5abe172612a..7abb8573a4d 100644 --- a/exporters/otlp/common/build.gradle.kts +++ b/exporters/otlp/common/build.gradle.kts @@ -12,16 +12,16 @@ description = "OpenTelemetry Protocol Exporter" otelJava.moduleName.set("io.opentelemetry.exporter.otlp.internal") dependencies { - protoSource(project(":proto")) + protoSource(project(":opentelemetry-proto")) - api(project(":api:all")) - api(project(":sdk:all")) - api(project(":sdk:metrics")) + api(project(":api:opentelemetry-api")) + api(project(":sdk:opentelemetry-sdk")) + api(project(":sdk:opentelemetry-sdk-metrics")) // We only use the protos for HTTP, logging-otlp, and metric export for now. Let them expose the // proto dependency in their POMs instead of here. This is fine because this artifact only // contains internal code. - compileOnly(project(":proto")) + compileOnly(project(":opentelemetry-proto")) compileOnly("com.fasterxml.jackson.core:jackson-core") @@ -35,8 +35,8 @@ dependencies { annotationProcessor("com.google.auto.value:auto-value") - testImplementation(project(":proto")) - testImplementation(project(":sdk:testing")) + testImplementation(project(":opentelemetry-proto")) + testImplementation(project(":sdk:opentelemetry-sdk-testing")) testImplementation("com.fasterxml.jackson.core:jackson-core") testImplementation("com.google.protobuf:protobuf-java-util") @@ -47,9 +47,9 @@ dependencies { testImplementation("io.grpc:grpc-testing") testRuntimeOnly("io.grpc:grpc-netty-shaded") - jmhImplementation(project(":proto")) - jmhImplementation(project(":sdk:testing")) - jmhImplementation(project(":sdk-extensions:resources")) + jmhImplementation(project(":opentelemetry-proto")) + jmhImplementation(project(":sdk:opentelemetry-sdk-testing")) + jmhImplementation(project(":sdk-extensions:opentelemetry-sdk-extension-resources")) jmhImplementation("com.fasterxml.jackson.core:jackson-core") jmhImplementation("org.curioswitch.curiostack:protobuf-jackson") jmhImplementation("com.google.protobuf:protobuf-java-util") diff --git a/exporters/otlp/metrics/build.gradle.kts b/exporters/otlp/metrics/build.gradle.kts index d3e3c8dd4de..65f3f8f2c1e 100644 --- a/exporters/otlp/metrics/build.gradle.kts +++ b/exporters/otlp/metrics/build.gradle.kts @@ -16,14 +16,14 @@ testSets { } dependencies { - api(project(":sdk:metrics")) + api(project(":sdk:opentelemetry-sdk-metrics")) - implementation(project(":exporters:otlp:common")) + implementation(project(":exporters:otlp:opentelemetry-exporter-otlp-common")) api("io.grpc:grpc-stub") - testImplementation(project(":proto")) - testImplementation(project(":sdk:testing")) + testImplementation(project(":opentelemetry-proto")) + testImplementation(project(":sdk:opentelemetry-sdk-testing")) testImplementation("com.google.protobuf:protobuf-java") testImplementation("io.grpc:grpc-protobuf") diff --git a/exporters/otlp/trace/build.gradle.kts b/exporters/otlp/trace/build.gradle.kts index 4a834952327..3892506870c 100644 --- a/exporters/otlp/trace/build.gradle.kts +++ b/exporters/otlp/trace/build.gradle.kts @@ -21,11 +21,11 @@ testSets { } dependencies { - api(project(":sdk:trace")) + api(project(":sdk:opentelemetry-sdk-trace")) - implementation(project(":api:metrics")) + implementation(project(":api:opentelemetry-api-metrics")) - implementation(project(":exporters:otlp:common")) + implementation(project(":exporters:otlp:opentelemetry-exporter-otlp-common")) compileOnly("io.grpc:grpc-netty") compileOnly("io.grpc:grpc-netty-shaded") @@ -34,8 +34,8 @@ dependencies { api("io.grpc:grpc-stub") implementation("io.grpc:grpc-api") - testImplementation(project(":proto")) - testImplementation(project(":sdk:testing")) + testImplementation(project(":opentelemetry-proto")) + testImplementation(project(":sdk:opentelemetry-sdk-testing")) testImplementation("com.google.protobuf:protobuf-java") testImplementation("io.grpc:grpc-protobuf") @@ -57,7 +57,7 @@ dependencies { add("testGrpcOkhttpRuntimeOnly", "io.grpc:grpc-okhttp") add("testGrpcOkhttpRuntimeOnly", "org.bouncycastle:bcpkix-jdk15on") - add("testSpanPipeline", project(":proto")) + add("testSpanPipeline", project(":opentelemetry-proto")) add("testSpanPipeline", "io.grpc:grpc-protobuf") add("testSpanPipeline", "io.grpc:grpc-testing") } diff --git a/exporters/prometheus/build.gradle.kts b/exporters/prometheus/build.gradle.kts index ba0da40cb8d..ed1dbe2762f 100644 --- a/exporters/prometheus/build.gradle.kts +++ b/exporters/prometheus/build.gradle.kts @@ -9,7 +9,7 @@ description = "OpenTelemetry Prometheus Exporter" otelJava.moduleName.set("io.opentelemetry.exporter.prometheus") dependencies { - api(project(":sdk:metrics")) + api(project(":sdk:opentelemetry-sdk-metrics")) api("io.prometheus:simpleclient") diff --git a/exporters/zipkin/build.gradle.kts b/exporters/zipkin/build.gradle.kts index 4193a1f64a4..d3f84a0b3cd 100644 --- a/exporters/zipkin/build.gradle.kts +++ b/exporters/zipkin/build.gradle.kts @@ -11,17 +11,17 @@ otelJava.moduleName.set("io.opentelemetry.exporter.zipkin") dependencies { compileOnly("com.google.auto.value:auto-value") - api(project(":sdk:all")) + api(project(":sdk:opentelemetry-sdk")) api("io.zipkin.reporter2:zipkin-reporter") annotationProcessor("com.google.auto.value:auto-value") - implementation(project(":semconv")) + implementation(project(":opentelemetry-semconv")) implementation("io.zipkin.reporter2:zipkin-sender-okhttp3") - testImplementation(project(":sdk:testing")) + testImplementation(project(":sdk:opentelemetry-sdk-testing")) testImplementation("io.zipkin.zipkin2:zipkin-junit") } diff --git a/extensions/annotations/build.gradle.kts b/extensions/annotations/build.gradle.kts index b76a10bab79..1c2a28e1de4 100644 --- a/extensions/annotations/build.gradle.kts +++ b/extensions/annotations/build.gradle.kts @@ -9,5 +9,5 @@ description = "OpenTelemetry Extension Annotations" otelJava.moduleName.set("io.opentelemetry.extension.annotations") dependencies { - api(project(":api:all")) + api(project(":api:opentelemetry-api")) } diff --git a/extensions/aws/build.gradle.kts b/extensions/aws/build.gradle.kts index 24209c37509..bd272a9ef3c 100644 --- a/extensions/aws/build.gradle.kts +++ b/extensions/aws/build.gradle.kts @@ -9,6 +9,6 @@ description = "OpenTelemetry API Extensions for AWS" otelJava.moduleName.set("io.opentelemetry.extension.aws") dependencies { - api(project(":api:all")) - compileOnly(project(":sdk-extensions:autoconfigure")) + api(project(":api:opentelemetry-api")) + compileOnly(project(":sdk-extensions:opentelemetry-sdk-extension-autoconfigure")) } diff --git a/extensions/build.gradle.kts b/extensions/build.gradle.kts deleted file mode 100644 index 49eeed9dc9f..00000000000 --- a/extensions/build.gradle.kts +++ /dev/null @@ -1,8 +0,0 @@ -subprojects { - val proj = this - plugins.withId("java") { - configure { - archivesBaseName = "opentelemetry-extension-${proj.name}" - } - } -} diff --git a/extensions/incubator/build.gradle.kts b/extensions/incubator/build.gradle.kts index 6acaf6cddb2..06e3c55f273 100644 --- a/extensions/incubator/build.gradle.kts +++ b/extensions/incubator/build.gradle.kts @@ -10,7 +10,7 @@ description = "OpenTelemetry API Incubator" otelJava.moduleName.set("io.opentelemetry.extension.incubator") dependencies { - api(project(":api:all")) + api(project(":api:opentelemetry-api")) - testImplementation(project(":sdk:testing")) + testImplementation(project(":sdk:opentelemetry-sdk-testing")) } diff --git a/extensions/kotlin/build.gradle.kts b/extensions/kotlin/build.gradle.kts index f0cff873c1b..8647c814acb 100644 --- a/extensions/kotlin/build.gradle.kts +++ b/extensions/kotlin/build.gradle.kts @@ -20,12 +20,12 @@ testSets { dependencies { implementation(platform("org.jetbrains.kotlin:kotlin-bom")) - api(project(":api:all")) + api(project(":api:opentelemetry-api")) compileOnly("org.jetbrains.kotlin:kotlin-stdlib-common") compileOnly("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.4.2") - testImplementation(project(":sdk:testing")) + testImplementation(project(":sdk:opentelemetry-sdk-testing")) testImplementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8") testImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.4.2") } diff --git a/extensions/noop-api/build.gradle.kts b/extensions/noop-api/build.gradle.kts index 22ac07e6f8d..e504f86fd18 100644 --- a/extensions/noop-api/build.gradle.kts +++ b/extensions/noop-api/build.gradle.kts @@ -9,5 +9,5 @@ description = "OpenTelemetry Noop API" otelJava.moduleName.set("io.opentelemetry.extension.noopapi") dependencies { - api(project(":api:all")) + api(project(":api:opentelemetry-api")) } diff --git a/extensions/trace-propagators/build.gradle.kts b/extensions/trace-propagators/build.gradle.kts index 485e8ee35a5..d5629b64bec 100644 --- a/extensions/trace-propagators/build.gradle.kts +++ b/extensions/trace-propagators/build.gradle.kts @@ -10,12 +10,12 @@ description = "OpenTelemetry Extension : Trace Propagators" otelJava.moduleName.set("io.opentelemetry.extension.trace.propagation") dependencies { - api(project(":api:all")) + api(project(":api:opentelemetry-api")) - compileOnly(project(":sdk-extensions:autoconfigure")) + compileOnly(project(":sdk-extensions:opentelemetry-sdk-extension-autoconfigure")) testImplementation("io.jaegertracing:jaeger-client") testImplementation("com.google.guava:guava") - jmhImplementation(project(":extensions:aws")) + jmhImplementation(project(":extensions:opentelemetry-extension-aws")) } diff --git a/integration-tests/build.gradle.kts b/integration-tests/build.gradle.kts index 448d3337de5..a58cb1c8f4a 100644 --- a/integration-tests/build.gradle.kts +++ b/integration-tests/build.gradle.kts @@ -6,16 +6,16 @@ description = "OpenTelemetry Integration Tests" otelJava.moduleName.set("io.opentelemetry.integration.tests") dependencies { - implementation(project(":sdk:all")) - implementation(project(":exporters:jaeger")) - implementation(project(":semconv")) + implementation(project(":sdk:opentelemetry-sdk")) + implementation(project(":exporters:opentelemetry-exporter-jaeger")) + implementation(project(":opentelemetry-semconv")) implementation("io.grpc:grpc-protobuf") implementation("com.google.protobuf:protobuf-java") implementation("io.grpc:grpc-netty-shaded") - testImplementation(project(":extensions:trace-propagators")) - testImplementation(project(":sdk:testing")) + testImplementation(project(":extensions:opentelemetry-extension-trace-propagators")) + testImplementation(project(":sdk:opentelemetry-sdk-testing")) testImplementation("org.junit.jupiter:junit-jupiter-params") testImplementation("com.fasterxml.jackson.core:jackson-databind") testImplementation("com.linecorp.armeria:armeria-junit5") diff --git a/integration-tests/tracecontext/build.gradle.kts b/integration-tests/tracecontext/build.gradle.kts index 8e4ef402d0b..2c996bf1d49 100644 --- a/integration-tests/tracecontext/build.gradle.kts +++ b/integration-tests/tracecontext/build.gradle.kts @@ -8,8 +8,8 @@ description = "OpenTelemetry W3C Context Propagation Integration Tests" otelJava.moduleName.set("io.opentelemetry.tracecontext.integration.tests") dependencies { - implementation(project(":sdk:all")) - implementation(project(":extensions:trace-propagators")) + implementation(project(":sdk:opentelemetry-sdk")) + implementation(project(":extensions:opentelemetry-extension-trace-propagators")) implementation("com.linecorp.armeria:armeria") implementation("org.slf4j:slf4j-simple") diff --git a/opencensus-shim/build.gradle.kts b/opencensus-shim/build.gradle.kts index 4522825899b..2e6c0a7b6d7 100644 --- a/opencensus-shim/build.gradle.kts +++ b/opencensus-shim/build.gradle.kts @@ -7,17 +7,17 @@ description = "OpenTelemetry OpenCensus Shim" otelJava.moduleName.set("io.opentelemetry.opencensusshim") dependencies { - api(project(":api:all")) - api(project(":extensions:trace-propagators")) - api(project(":sdk:all")) - api(project(":sdk:metrics")) + api(project(":api:opentelemetry-api")) + api(project(":extensions:opentelemetry-extension-trace-propagators")) + api(project(":sdk:opentelemetry-sdk")) + api(project(":sdk:opentelemetry-sdk-metrics")) api("io.opencensus:opencensus-api") api("io.opencensus:opencensus-impl-core") api("io.opencensus:opencensus-exporter-metrics-util") - testImplementation(project(":sdk:all")) - testImplementation(project(":sdk:metrics-testing")) + testImplementation(project(":sdk:opentelemetry-sdk")) + testImplementation(project(":sdk:opentelemetry-sdk-metrics-testing")) testImplementation("org.slf4j:slf4j-simple") testImplementation("io.opencensus:opencensus-impl") diff --git a/opentracing-shim/build.gradle.kts b/opentracing-shim/build.gradle.kts index 8838bb54ecd..920c7f8e624 100644 --- a/opentracing-shim/build.gradle.kts +++ b/opentracing-shim/build.gradle.kts @@ -7,12 +7,12 @@ description = "OpenTelemetry OpenTracing Bridge" otelJava.moduleName.set("io.opentelemetry.opentracingshim") dependencies { - api(project(":api:all")) + api(project(":api:opentelemetry-api")) api("io.opentracing:opentracing-api") - implementation(project(":semconv")) + implementation(project(":opentelemetry-semconv")) - testImplementation(project(":sdk:testing")) + testImplementation(project(":sdk:opentelemetry-sdk-testing")) testImplementation("org.slf4j:slf4j-simple") } diff --git a/perf-harness/build.gradle.kts b/perf-harness/build.gradle.kts index ea6520c5f4e..c44ff5bcd77 100644 --- a/perf-harness/build.gradle.kts +++ b/perf-harness/build.gradle.kts @@ -6,12 +6,12 @@ description = "Performance Testing Harness" otelJava.moduleName.set("io.opentelemetry.perf-harness") dependencies { - implementation(project(":api:all")) - implementation(project(":sdk:all")) - implementation(project(":sdk:testing")) - implementation(project(":exporters:otlp:trace")) - implementation(project(":exporters:logging")) - implementation(project(":semconv")) + implementation(project(":api:opentelemetry-api")) + implementation(project(":sdk:opentelemetry-sdk")) + implementation(project(":sdk:opentelemetry-sdk-testing")) + implementation(project(":exporters:otlp:opentelemetry-exporter-otlp-trace")) + implementation(project(":exporters:opentelemetry-exporter-logging")) + implementation(project(":opentelemetry-semconv")) implementation("eu.rekawek.toxiproxy:toxiproxy-java") implementation("org.testcontainers:junit-jupiter") diff --git a/sdk-extensions/async-processor/build.gradle.kts b/sdk-extensions/async-processor/build.gradle.kts index 3cb38e98fc9..3d616872e37 100644 --- a/sdk-extensions/async-processor/build.gradle.kts +++ b/sdk-extensions/async-processor/build.gradle.kts @@ -9,8 +9,8 @@ description = "OpenTelemetry SDK Extension: Async SpanProcessor" otelJava.moduleName.set("io.opentelemetry.sdk.extension.trace.export") dependencies { - api(project(":api:all")) - api(project(":sdk:all")) + api(project(":api:opentelemetry-api")) + api(project(":sdk:opentelemetry-sdk")) implementation("com.google.guava:guava") implementation("com.lmax:disruptor") diff --git a/sdk-extensions/autoconfigure-spi/build.gradle.kts b/sdk-extensions/autoconfigure-spi/build.gradle.kts index 53b10f0a104..6ea23d55274 100644 --- a/sdk-extensions/autoconfigure-spi/build.gradle.kts +++ b/sdk-extensions/autoconfigure-spi/build.gradle.kts @@ -7,5 +7,5 @@ description = "OpenTelemetry SDK Auto-configuration SPI" otelJava.moduleName.set("io.opentelemetry.sdk.autoconfigure.spi") dependencies { - api(project(":sdk:all")) + api(project(":sdk:opentelemetry-sdk")) } diff --git a/sdk-extensions/autoconfigure/build.gradle.kts b/sdk-extensions/autoconfigure/build.gradle.kts index b26bf8632f1..b7f0cacd132 100644 --- a/sdk-extensions/autoconfigure/build.gradle.kts +++ b/sdk-extensions/autoconfigure/build.gradle.kts @@ -22,70 +22,70 @@ testSets { } dependencies { - api(project(":sdk:all")) - api(project(":sdk:metrics")) - api(project(":sdk-extensions:autoconfigure-spi")) - - implementation(project(":semconv")) - - compileOnly(project(":exporters:jaeger")) - compileOnly(project(":exporters:logging")) - compileOnly(project(":exporters:otlp:all")) - compileOnly(project(":exporters:otlp:metrics")) - compileOnly(project(":exporters:otlp-http:trace")) - compileOnly(project(":exporters:otlp-http:metrics")) - compileOnly(project(":exporters:prometheus")) + api(project(":sdk:opentelemetry-sdk")) + api(project(":sdk:opentelemetry-sdk-metrics")) + api(project(":sdk-extensions:opentelemetry-sdk-extension-autoconfigure-spi")) + + implementation(project(":opentelemetry-semconv")) + + compileOnly(project(":exporters:opentelemetry-exporter-jaeger")) + compileOnly(project(":exporters:opentelemetry-exporter-logging")) + compileOnly(project(":exporters:otlp:opentelemetry-exporter-otlp")) + compileOnly(project(":exporters:otlp:opentelemetry-exporter-otlp-metrics")) + compileOnly(project(":exporters:otlp-http:opentelemetry-exporter-otlp-http-trace")) + compileOnly(project(":exporters:otlp-http:opentelemetry-exporter-otlp-http-metrics")) + compileOnly(project(":exporters:opentelemetry-exporter-prometheus")) compileOnly("io.prometheus:simpleclient_httpserver") - compileOnly(project(":exporters:zipkin")) + compileOnly(project(":exporters:opentelemetry-exporter-zipkin")) - testImplementation(project(path = ":sdk:trace-shaded-deps")) + testImplementation(project(path = ":sdk:sdk-trace-shaded-deps")) - testImplementation(project(":proto")) - testImplementation(project(":sdk:testing")) + testImplementation(project(":opentelemetry-proto")) + testImplementation(project(":sdk:opentelemetry-sdk-testing")) testImplementation("com.linecorp.armeria:armeria-junit5") testImplementation("com.linecorp.armeria:armeria-grpc") testRuntimeOnly("io.grpc:grpc-netty-shaded") testRuntimeOnly("org.slf4j:slf4j-simple") - add("testFullConfigImplementation", project(":extensions:aws")) - add("testFullConfigImplementation", project(":extensions:trace-propagators")) - add("testFullConfigImplementation", project(":exporters:jaeger")) - add("testFullConfigImplementation", project(":exporters:logging")) - add("testFullConfigImplementation", project(":exporters:otlp:all")) - add("testFullConfigImplementation", project(":exporters:otlp:metrics")) - add("testFullConfigImplementation", project(":exporters:prometheus")) + add("testFullConfigImplementation", project(":extensions:opentelemetry-extension-aws")) + add("testFullConfigImplementation", project(":extensions:opentelemetry-extension-trace-propagators")) + add("testFullConfigImplementation", project(":exporters:opentelemetry-exporter-jaeger")) + add("testFullConfigImplementation", project(":exporters:opentelemetry-exporter-logging")) + add("testFullConfigImplementation", project(":exporters:otlp:opentelemetry-exporter-otlp")) + add("testFullConfigImplementation", project(":exporters:otlp:opentelemetry-exporter-otlp-metrics")) + add("testFullConfigImplementation", project(":exporters:opentelemetry-exporter-prometheus")) add("testFullConfigImplementation", "io.prometheus:simpleclient_httpserver") - add("testFullConfigImplementation", project(":exporters:zipkin")) - add("testFullConfigImplementation", project(":sdk-extensions:resources")) + add("testFullConfigImplementation", project(":exporters:opentelemetry-exporter-zipkin")) + add("testFullConfigImplementation", project(":sdk-extensions:opentelemetry-sdk-extension-resources")) - add("testOtlpGrpcImplementation", project(":exporters:otlp:all")) - add("testOtlpGrpcImplementation", project(":exporters:otlp:metrics")) + add("testOtlpGrpcImplementation", project(":exporters:otlp:opentelemetry-exporter-otlp")) + add("testOtlpGrpcImplementation", project(":exporters:otlp:opentelemetry-exporter-otlp-metrics")) add("testOtlpGrpcImplementation", "org.bouncycastle:bcpkix-jdk15on") - add("testOtlpHttpImplementation", project(":exporters:otlp-http:trace")) - add("testOtlpHttpImplementation", project(":exporters:otlp-http:metrics")) + add("testOtlpHttpImplementation", project(":exporters:otlp-http:opentelemetry-exporter-otlp-http-trace")) + add("testOtlpHttpImplementation", project(":exporters:otlp-http:opentelemetry-exporter-otlp-http-metrics")) add("testOtlpHttpImplementation", "com.squareup.okhttp3:okhttp") add("testOtlpHttpImplementation", "com.squareup.okhttp3:okhttp-tls") add("testOtlpHttpImplementation", "org.bouncycastle:bcpkix-jdk15on") - add("testJaegerImplementation", project(":exporters:jaeger")) + add("testJaegerImplementation", project(":exporters:opentelemetry-exporter-jaeger")) - add("testZipkinImplementation", project(":exporters:zipkin")) + add("testZipkinImplementation", project(":exporters:opentelemetry-exporter-zipkin")) - add("testConfigErrorImplementation", project(":extensions:trace-propagators")) - add("testConfigErrorImplementation", project(":exporters:jaeger")) - add("testConfigErrorImplementation", project(":exporters:logging")) - add("testConfigErrorImplementation", project(":exporters:otlp:all")) - add("testConfigErrorImplementation", project(":exporters:otlp:metrics")) - add("testConfigErrorImplementation", project(":exporters:prometheus")) + add("testConfigErrorImplementation", project(":extensions:opentelemetry-extension-trace-propagators")) + add("testConfigErrorImplementation", project(":exporters:opentelemetry-exporter-jaeger")) + add("testConfigErrorImplementation", project(":exporters:opentelemetry-exporter-logging")) + add("testConfigErrorImplementation", project(":exporters:otlp:opentelemetry-exporter-otlp")) + add("testConfigErrorImplementation", project(":exporters:otlp:opentelemetry-exporter-otlp-metrics")) + add("testConfigErrorImplementation", project(":exporters:opentelemetry-exporter-prometheus")) add("testConfigErrorImplementation", "io.prometheus:simpleclient_httpserver") - add("testConfigErrorImplementation", project(":exporters:zipkin")) + add("testConfigErrorImplementation", project(":exporters:opentelemetry-exporter-zipkin")) add("testConfigErrorImplementation", "org.junit-pioneer:junit-pioneer") - add("testPrometheusImplementation", project(":exporters:prometheus")) + add("testPrometheusImplementation", project(":exporters:opentelemetry-exporter-prometheus")) add("testPrometheusImplementation", "io.prometheus:simpleclient_httpserver") - add("testResourceDisabledByPropertyImplementation", project(":sdk-extensions:resources")) - add("testResourceDisabledByEnvImplementation", project(":sdk-extensions:resources")) + add("testResourceDisabledByPropertyImplementation", project(":sdk-extensions:opentelemetry-sdk-extension-resources")) + add("testResourceDisabledByEnvImplementation", project(":sdk-extensions:opentelemetry-sdk-extension-resources")) } tasks { diff --git a/sdk-extensions/aws/build.gradle.kts b/sdk-extensions/aws/build.gradle.kts index bb8e783b544..c43c9b2f050 100644 --- a/sdk-extensions/aws/build.gradle.kts +++ b/sdk-extensions/aws/build.gradle.kts @@ -9,20 +9,20 @@ description = "OpenTelemetry SDK AWS Instrumentation Support" otelJava.moduleName.set("io.opentelemetry.sdk.extension.trace.aws") dependencies { - api(project(":api:all")) - api(project(":sdk:all")) + api(project(":api:opentelemetry-api")) + api(project(":sdk:opentelemetry-sdk")) - compileOnly(project(":sdk-extensions:autoconfigure")) + compileOnly(project(":sdk-extensions:opentelemetry-sdk-extension-autoconfigure")) annotationProcessor("com.google.auto.value:auto-value") - implementation(project(":semconv")) + implementation(project(":opentelemetry-semconv")) implementation("com.fasterxml.jackson.core:jackson-core") implementation("com.fasterxml.jackson.core:jackson-databind") - testImplementation(project(":sdk:testing")) - testImplementation(project(":sdk-extensions:autoconfigure")) + testImplementation(project(":sdk:opentelemetry-sdk-testing")) + testImplementation(project(":sdk-extensions:opentelemetry-sdk-extension-autoconfigure")) testImplementation("com.linecorp.armeria:armeria-junit5") testRuntimeOnly("org.bouncycastle:bcpkix-jdk15on") diff --git a/sdk-extensions/build.gradle.kts b/sdk-extensions/build.gradle.kts deleted file mode 100644 index 25b37e31c5d..00000000000 --- a/sdk-extensions/build.gradle.kts +++ /dev/null @@ -1,8 +0,0 @@ -subprojects { - val proj = this - plugins.withId("java") { - configure { - archivesBaseName = "opentelemetry-sdk-extension-${proj.name}" - } - } -} diff --git a/sdk-extensions/jaeger-remote-sampler/build.gradle.kts b/sdk-extensions/jaeger-remote-sampler/build.gradle.kts index 501ac572388..b00dd3cceff 100644 --- a/sdk-extensions/jaeger-remote-sampler/build.gradle.kts +++ b/sdk-extensions/jaeger-remote-sampler/build.gradle.kts @@ -9,17 +9,17 @@ description = "OpenTelemetry - Jaeger Remote sampler" otelJava.moduleName.set("io.opentelemetry.sdk.extension.trace.jaeger") dependencies { - api(project(":sdk:all")) - compileOnly(project(":sdk-extensions:autoconfigure")) + api(project(":sdk:opentelemetry-sdk")) + compileOnly(project(":sdk-extensions:opentelemetry-sdk-extension-autoconfigure")) - implementation(project(":sdk:all")) + implementation(project(":sdk:opentelemetry-sdk")) implementation("io.grpc:grpc-api") implementation("io.grpc:grpc-protobuf") implementation("io.grpc:grpc-stub") implementation("com.google.protobuf:protobuf-java") - testImplementation(project(":sdk:testing")) - testImplementation(project(":sdk-extensions:autoconfigure")) + testImplementation(project(":sdk:opentelemetry-sdk-testing")) + testImplementation(project(":sdk-extensions:opentelemetry-sdk-extension-autoconfigure")) testImplementation("io.grpc:grpc-testing") testImplementation("org.testcontainers:junit-jupiter") diff --git a/sdk-extensions/jfr-events/build.gradle.kts b/sdk-extensions/jfr-events/build.gradle.kts index c45dc715b03..a0bc7cec45d 100644 --- a/sdk-extensions/jfr-events/build.gradle.kts +++ b/sdk-extensions/jfr-events/build.gradle.kts @@ -7,8 +7,8 @@ description = "OpenTelemetry SDK Extension JFR" otelJava.moduleName.set("io.opentelemetry.sdk.extension.jfr") dependencies { - implementation(project(":api:all")) - implementation(project(":sdk:all")) + implementation(project(":api:opentelemetry-api")) + implementation(project(":sdk:opentelemetry-sdk")) } tasks { diff --git a/sdk-extensions/logging/build.gradle.kts b/sdk-extensions/logging/build.gradle.kts index 03cd5b3dcf5..9cacb5af4d7 100644 --- a/sdk-extensions/logging/build.gradle.kts +++ b/sdk-extensions/logging/build.gradle.kts @@ -9,9 +9,9 @@ description = "OpenTelemetry Contrib Logging Support" otelJava.moduleName.set("io.opentelemetry.sdk.extension.logging") dependencies { - api(project(":sdk:all")) + api(project(":sdk:opentelemetry-sdk")) - implementation(project(":api:metrics")) + implementation(project(":api:opentelemetry-api-metrics")) implementation("com.fasterxml.jackson.core:jackson-databind") testImplementation("org.awaitility:awaitility") diff --git a/sdk-extensions/resources/build.gradle.kts b/sdk-extensions/resources/build.gradle.kts index c43d9f1e80c..176348b5789 100644 --- a/sdk-extensions/resources/build.gradle.kts +++ b/sdk-extensions/resources/build.gradle.kts @@ -11,11 +11,11 @@ otelJava.moduleName.set("io.opentelemetry.sdk.extension.resources") val mrJarVersions = listOf(11) dependencies { - api(project(":sdk:common")) + api(project(":sdk:opentelemetry-sdk-common")) - implementation(project(":semconv")) + implementation(project(":opentelemetry-semconv")) - compileOnly(project(":sdk-extensions:autoconfigure")) + compileOnly(project(":sdk-extensions:opentelemetry-sdk-extension-autoconfigure")) compileOnly("org.codehaus.mojo:animal-sniffer-annotations") diff --git a/sdk-extensions/tracing-incubator/build.gradle.kts b/sdk-extensions/tracing-incubator/build.gradle.kts index 0769ecfc526..f98770b0c13 100644 --- a/sdk-extensions/tracing-incubator/build.gradle.kts +++ b/sdk-extensions/tracing-incubator/build.gradle.kts @@ -12,34 +12,34 @@ description = "OpenTelemetry SDK Tracing Incubator" otelJava.moduleName.set("io.opentelemetry.sdk.extension.trace.incubator") dependencies { - api(project(":api:all")) - api(project(":sdk:all")) + api(project(":api:opentelemetry-api")) + api(project(":sdk:opentelemetry-sdk")) - implementation(project(":api:metrics")) - implementation(project(":semconv")) + implementation(project(":api:opentelemetry-api-metrics")) + implementation(project(":opentelemetry-semconv")) implementation("org.jctools:jctools-core:3.3.0") annotationProcessor("com.google.auto.value:auto-value") - testImplementation(project(":sdk:testing")) + testImplementation(project(":sdk:opentelemetry-sdk-testing")) testImplementation("com.google.guava:guava-testlib") - jmh(project(":sdk:metrics")) - jmh(project(":sdk:testing")) { + jmh(project(":sdk:opentelemetry-sdk-metrics")) + jmh(project(":sdk:opentelemetry-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. isTransitive = false } - jmh(project(":exporters:otlp:trace")) { + jmh(project(":exporters:otlp:opentelemetry-exporter-otlp-trace")) { // The opentelemetry-exporter-otlp-trace depends on this project itself. So don"t pull in // the transitive dependencies. isTransitive = false } // explicitly adding the opentelemetry-exporter-otlp dependencies - jmh(project(":exporters:otlp:common")) { + jmh(project(":exporters:otlp:opentelemetry-exporter-otlp-common")) { isTransitive = false } - jmh(project(":proto")) + jmh(project(":opentelemetry-proto")) jmh("com.google.guava:guava") jmh("io.grpc:grpc-api") diff --git a/sdk-extensions/zpages/build.gradle.kts b/sdk-extensions/zpages/build.gradle.kts index 16143f99bb5..45bb2978526 100644 --- a/sdk-extensions/zpages/build.gradle.kts +++ b/sdk-extensions/zpages/build.gradle.kts @@ -9,10 +9,10 @@ description = "OpenTelemetry - zPages" otelJava.moduleName.set("io.opentelemetry.sdk.extension.zpages") dependencies { - implementation(project(":api:all")) - implementation(project(":sdk:all")) + implementation(project(":api:opentelemetry-api")) + implementation(project(":sdk:opentelemetry-sdk")) - testImplementation(project(":sdk:testing")) + testImplementation(project(":sdk:opentelemetry-sdk-testing")) testImplementation("com.google.guava:guava") diff --git a/sdk/all/build.gradle.kts b/sdk/all/build.gradle.kts index cf66d6abab6..e11405ad013 100644 --- a/sdk/all/build.gradle.kts +++ b/sdk/all/build.gradle.kts @@ -11,13 +11,13 @@ otelJava.moduleName.set("io.opentelemetry.sdk") base.archivesName.set("opentelemetry-sdk") dependencies { - api(project(":api:all")) - api(project(":sdk:common")) - api(project(":sdk:trace")) + api(project(":api:opentelemetry-api")) + api(project(":sdk:opentelemetry-sdk-common")) + api(project(":sdk:opentelemetry-sdk-trace")) annotationProcessor("com.google.auto.value:auto-value") testAnnotationProcessor("com.google.auto.value:auto-value") - testImplementation(project(":sdk:testing")) + testImplementation(project(":sdk:opentelemetry-sdk-testing")) } diff --git a/sdk/build.gradle.kts b/sdk/build.gradle.kts deleted file mode 100644 index f270de8647d..00000000000 --- a/sdk/build.gradle.kts +++ /dev/null @@ -1,10 +0,0 @@ -subprojects { - // Workaround https://github.com/gradle/gradle/issues/847 - group = "io.opentelemetry.sdk" - val proj = this - plugins.withId("java") { - configure { - archivesBaseName = "opentelemetry-sdk-${proj.name}" - } - } -} diff --git a/sdk/common/build.gradle.kts b/sdk/common/build.gradle.kts index dd02fe426ed..35f72009c62 100644 --- a/sdk/common/build.gradle.kts +++ b/sdk/common/build.gradle.kts @@ -17,16 +17,16 @@ testSets { } dependencies { - api(project(":api:all")) + api(project(":api:opentelemetry-api")) - implementation(project(":semconv")) + implementation(project(":opentelemetry-semconv")) annotationProcessor("com.google.auto.value:auto-value") testAnnotationProcessor("com.google.auto.value:auto-value") - testImplementation(project(":sdk:testing")) - testImplementation(project(":sdk-extensions:resources")) + testImplementation(project(":sdk:opentelemetry-sdk-testing")) + testImplementation(project(":sdk-extensions:opentelemetry-sdk-extension-resources")) testImplementation("com.google.guava:guava-testlib") } diff --git a/sdk/common/src/test/java/io/opentelemetry/sdk/resources/ResourceTest.java b/sdk/common/src/test/java/io/opentelemetry/sdk/resources/ResourceTest.java index d200c62dc76..39a9aeaaf56 100644 --- a/sdk/common/src/test/java/io/opentelemetry/sdk/resources/ResourceTest.java +++ b/sdk/common/src/test/java/io/opentelemetry/sdk/resources/ResourceTest.java @@ -205,6 +205,7 @@ void testMergeResources_Resource2_Null() { } @Test + @SuppressWarnings("SystemOut") void testDefaultResources() { Resource resource = Resource.getDefault(); assertThat(resource.getAttribute(ResourceAttributes.SERVICE_NAME)) @@ -214,6 +215,7 @@ void testDefaultResources() { assertThat(resource.getAttribute(ResourceAttributes.TELEMETRY_SDK_LANGUAGE)).isEqualTo("java"); assertThat(resource.getAttribute(ResourceAttributes.TELEMETRY_SDK_VERSION)) .isEqualTo(System.getProperty("otel.test.project-version")); + System.out.println(resource.getAttribute(ResourceAttributes.TELEMETRY_SDK_VERSION)); } @Test diff --git a/sdk/metrics-testing/build.gradle.kts b/sdk/metrics-testing/build.gradle.kts index 95c8dcd980a..1039148f318 100644 --- a/sdk/metrics-testing/build.gradle.kts +++ b/sdk/metrics-testing/build.gradle.kts @@ -7,10 +7,10 @@ description = "OpenTelemetry Metrics SDK Testing utilities" otelJava.moduleName.set("io.opentelemetry.sdk.metrics-testing") dependencies { - api(project(":api:all")) - api(project(":sdk:all")) - api(project(":sdk:metrics")) - api(project(":sdk:testing")) + api(project(":api:opentelemetry-api")) + api(project(":sdk:opentelemetry-sdk")) + api(project(":sdk:opentelemetry-sdk-metrics")) + api(project(":sdk:opentelemetry-sdk-testing")) compileOnly("org.assertj:assertj-core") compileOnly("junit:junit") diff --git a/sdk/metrics/build.gradle.kts b/sdk/metrics/build.gradle.kts index ecd4db8f24e..b280a248b0a 100644 --- a/sdk/metrics/build.gradle.kts +++ b/sdk/metrics/build.gradle.kts @@ -13,14 +13,14 @@ description = "OpenTelemetry SDK Metrics" otelJava.moduleName.set("io.opentelemetry.sdk.metrics") dependencies { - api(project(":api:metrics")) - api(project(":sdk:common")) + api(project(":api:opentelemetry-api-metrics")) + api(project(":sdk:opentelemetry-sdk-common")) annotationProcessor("com.google.auto.value:auto-value") testAnnotationProcessor("com.google.auto.value:auto-value") - testImplementation(project(":sdk:metrics-testing")) - testImplementation(project(":sdk:testing")) + testImplementation(project(":sdk:opentelemetry-sdk-metrics-testing")) + testImplementation(project(":sdk:opentelemetry-sdk-testing")) testImplementation("com.google.guava:guava") } diff --git a/sdk/trace-shaded-deps/build.gradle.kts b/sdk/sdk-trace-shaded-deps/build.gradle.kts similarity index 100% rename from sdk/trace-shaded-deps/build.gradle.kts rename to sdk/sdk-trace-shaded-deps/build.gradle.kts diff --git a/sdk/trace-shaded-deps/src/main/java/io/opentelemetry/sdk/trace/internal/JcTools.java b/sdk/sdk-trace-shaded-deps/src/main/java/io/opentelemetry/sdk/trace/internal/JcTools.java similarity index 100% rename from sdk/trace-shaded-deps/src/main/java/io/opentelemetry/sdk/trace/internal/JcTools.java rename to sdk/sdk-trace-shaded-deps/src/main/java/io/opentelemetry/sdk/trace/internal/JcTools.java diff --git a/sdk/testing/build.gradle.kts b/sdk/testing/build.gradle.kts index ec1f61f871c..096ae6ccb76 100644 --- a/sdk/testing/build.gradle.kts +++ b/sdk/testing/build.gradle.kts @@ -7,8 +7,8 @@ description = "OpenTelemetry SDK Testing utilities" otelJava.moduleName.set("io.opentelemetry.sdk.testing") dependencies { - api(project(":api:all")) - api(project(":sdk:all")) + api(project(":api:opentelemetry-api")) + api(project(":sdk:opentelemetry-sdk")) compileOnly("org.assertj:assertj-core") compileOnly("junit:junit") @@ -16,7 +16,7 @@ dependencies { annotationProcessor("com.google.auto.value:auto-value") - implementation(project(":semconv")) + implementation(project(":opentelemetry-semconv")) testImplementation("junit:junit") } diff --git a/sdk/trace/build.gradle.kts b/sdk/trace/build.gradle.kts index d743d5677ef..616904f4fbe 100644 --- a/sdk/trace/build.gradle.kts +++ b/sdk/trace/build.gradle.kts @@ -13,45 +13,45 @@ otelJava.moduleName.set("io.opentelemetry.sdk.trace") sourceSets { main { - val traceShadedDeps = project(":sdk:trace-shaded-deps") - output.dir(traceShadedDeps.file("build/extracted/shadow"), "builtBy" to ":sdk:trace-shaded-deps:extractShadowJar") + val traceShadedDeps = project(":sdk:sdk-trace-shaded-deps") + output.dir(traceShadedDeps.file("build/extracted/shadow"), "builtBy" to ":sdk:sdk-trace-shaded-deps:extractShadowJar") } } dependencies { - api(project(":api:all")) - api(project(":sdk:common")) + api(project(":api:opentelemetry-api")) + api(project(":sdk:opentelemetry-sdk-common")) - compileOnly(project(":sdk:trace-shaded-deps")) + compileOnly(project(":sdk:sdk-trace-shaded-deps")) - implementation(project(":api:metrics")) - implementation(project(":semconv")) + implementation(project(":api:opentelemetry-api-metrics")) + implementation(project(":opentelemetry-semconv")) annotationProcessor("com.google.auto.value:auto-value") testAnnotationProcessor("com.google.auto.value:auto-value") - testImplementation(project(":sdk:testing")) + testImplementation(project(":sdk:opentelemetry-sdk-testing")) testImplementation("com.google.guava:guava") - jmh(project(":sdk:metrics")) - jmh(project(":sdk:testing")) { + jmh(project(":sdk:opentelemetry-sdk-metrics")) + jmh(project(":sdk:opentelemetry-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. isTransitive = false } - jmh(project(":exporters:jaeger-thrift")) - jmh(project(":exporters:otlp:trace")) { + jmh(project(":exporters:opentelemetry-exporter-jaeger-thrift")) + jmh(project(":exporters:otlp:opentelemetry-exporter-otlp-trace")) { // The opentelemetry-exporter-otlp-trace depends on this project itself. So don"t pull in // the transitive dependencies. isTransitive = false } // explicitly adding the opentelemetry-exporter-otlp dependencies - jmh(project(":exporters:otlp:common")) { + jmh(project(":exporters:otlp:opentelemetry-exporter-otlp-common")) { isTransitive = false } - jmh(project(":proto")) + jmh(project(":opentelemetry-proto")) jmh("com.google.guava:guava") jmh("io.grpc:grpc-api") diff --git a/semconv/build.gradle.kts b/semconv/build.gradle.kts index 6ddee0bd7b2..5a5105778d0 100644 --- a/semconv/build.gradle.kts +++ b/semconv/build.gradle.kts @@ -9,5 +9,5 @@ description = "OpenTelemetry Semantic Conventions" otelJava.moduleName.set("io.opentelemetry.semconv") dependencies { - api(project(":api:all")) + api(project(":api:opentelemetry-api")) } diff --git a/settings.gradle.kts b/settings.gradle.kts index 106242ff282..1644cfbc669 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -25,54 +25,75 @@ dependencyResolutionManagement { rootProject.name = "opentelemetry-java" include(":all") -include(":api:all") -include(":api:metrics") -include(":semconv") -include(":bom") -include(":bom-alpha") -include(":context") +include(":api:opentelemetry-api") +include(":api:opentelemetry-api-metrics") +include(":opentelemetry-semconv") +include(":opentelemetry-bom") +include(":opentelemetry-bom-alpha") +include(":opentelemetry-context") include(":dependencyManagement") -include(":extensions:annotations") -include(":extensions:incubator") -include(":extensions:aws") -include(":extensions:kotlin") -include(":extensions:noop-api") -include(":extensions:trace-propagators") -include(":exporters:jaeger") -include(":exporters:jaeger-thrift") -include(":exporters:logging") -include(":exporters:logging-otlp") -include(":exporters:otlp:all") -include(":exporters:otlp:common") -include(":exporters:otlp:metrics") -include(":exporters:otlp:trace") -include(":exporters:otlp-http:metrics") -include(":exporters:otlp-http:trace") -include(":exporters:prometheus") -include(":exporters:zipkin") +include(":extensions:opentelemetry-extension-annotations") +include(":extensions:opentelemetry-extension-incubator") +include(":extensions:opentelemetry-extension-aws") +include(":extensions:opentelemetry-extension-kotlin") +include(":extensions:opentelemetry-extension-noop-api") +include(":extensions:opentelemetry-extension-trace-propagators") +include(":exporters:opentelemetry-exporter-jaeger") +include(":exporters:opentelemetry-exporter-jaeger-thrift") +include(":exporters:opentelemetry-exporter-logging") +include(":exporters:opentelemetry-exporter-logging-otlp") +include(":exporters:otlp:opentelemetry-exporter-otlp") +include(":exporters:otlp:opentelemetry-exporter-otlp-common") +include(":exporters:otlp:opentelemetry-exporter-otlp-metrics") +include(":exporters:otlp:opentelemetry-exporter-otlp-trace") +include(":exporters:otlp-http:opentelemetry-exporter-otlp-http-metrics") +include(":exporters:otlp-http:opentelemetry-exporter-otlp-http-trace") +include(":exporters:opentelemetry-exporter-prometheus") +include(":exporters:opentelemetry-exporter-zipkin") include(":integration-tests") include(":integration-tests:tracecontext") -include(":opencensus-shim") -include(":opentracing-shim") +include(":opentelemetry-opencensus-shim") +include(":opentelemetry-opentracing-shim") include(":perf-harness") -include(":proto") -include(":sdk:all") -include(":sdk:common") -include(":sdk:metrics") -include(":sdk:metrics-testing") -include(":sdk:testing") -include(":sdk:trace") -include(":sdk:trace-shaded-deps") -include(":sdk-extensions:async-processor") -include(":sdk-extensions:autoconfigure") -include(":sdk-extensions:autoconfigure-spi") -include(":sdk-extensions:aws") -include(":sdk-extensions:logging") -include(":sdk-extensions:resources") -include(":sdk-extensions:tracing-incubator") -include(":sdk-extensions:jaeger-remote-sampler") -include(":sdk-extensions:jfr-events") -include(":sdk-extensions:zpages") +include(":opentelemetry-proto") +include(":sdk:opentelemetry-sdk") +include(":sdk:opentelemetry-sdk-common") +include(":sdk:opentelemetry-sdk-metrics") +include(":sdk:opentelemetry-sdk-metrics-testing") +include(":sdk:opentelemetry-sdk-testing") +include(":sdk:opentelemetry-sdk-trace") +include(":sdk:sdk-trace-shaded-deps") +include(":sdk-extensions:opentelemetry-sdk-extension-async-processor") +include(":sdk-extensions:opentelemetry-sdk-extension-autoconfigure") +include(":sdk-extensions:opentelemetry-sdk-extension-autoconfigure-spi") +include(":sdk-extensions:opentelemetry-sdk-extension-aws") +include(":sdk-extensions:opentelemetry-sdk-extension-logging") +include(":sdk-extensions:opentelemetry-sdk-extension-resources") +include(":sdk-extensions:opentelemetry-sdk-extension-tracing-incubator") +include(":sdk-extensions:opentelemetry-sdk-extension-jaeger-remote-sampler") +include(":sdk-extensions:opentelemetry-sdk-extension-jfr-events") +include(":sdk-extensions:opentelemetry-sdk-extension-zpages") + +// Map project names to directory names. +fun patchNames(rootProject: ProjectDescriptor) { + rootProject.children.forEach { + if (it.name.startsWith("opentelemetry-")) { + val pathParts = it.path.split(":").toMutableList() + val prefix = "opentelemetry" + pathParts.subList(0, pathParts.lastIndex).joinToString("-") + val singularPrefix = "opentelemetry" + pathParts + .subList(0, pathParts.lastIndex) + .joinToString("-") { s -> s.removeSuffix("s") } + pathParts[pathParts.lastIndex] = pathParts.last() + .replaceFirst(prefix, "") + .replaceFirst(singularPrefix, "") + .removePrefix("-") + .ifEmpty { "all" } + it.projectDir = file(pathParts.joinToString("/")) + } + patchNames(it) + } +} +patchNames(rootProject) val isCI = System.getenv("CI") != null gradleEnterprise { From bc7cd03fc8bac87cf77e858b1f1a5136d2e61fea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20Neum=C3=BCller?= Date: Mon, 13 Sep 2021 17:34:41 +0200 Subject: [PATCH 2/4] Debug CI. --- settings.gradle.kts | 1 + 1 file changed, 1 insertion(+) diff --git a/settings.gradle.kts b/settings.gradle.kts index 1644cfbc669..fdd944161ac 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -89,6 +89,7 @@ fun patchNames(rootProject: ProjectDescriptor) { .removePrefix("-") .ifEmpty { "all" } it.projectDir = file(pathParts.joinToString("/")) + println("Directory of ${it.path} is ${it.projectDir}") } patchNames(it) } From 8781a234d65bb8ac9be5fe45f2d26f046b7b2040 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20Neum=C3=BCller?= Date: Mon, 13 Sep 2021 17:41:49 +0200 Subject: [PATCH 3/4] Fix leading slash. --- settings.gradle.kts | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/settings.gradle.kts b/settings.gradle.kts index fdd944161ac..9fc9654aa4a 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -79,8 +79,9 @@ fun patchNames(rootProject: ProjectDescriptor) { rootProject.children.forEach { if (it.name.startsWith("opentelemetry-")) { val pathParts = it.path.split(":").toMutableList() - val prefix = "opentelemetry" + pathParts.subList(0, pathParts.lastIndex).joinToString("-") - val singularPrefix = "opentelemetry" + pathParts + pathParts.removeFirst() // Leading ":" gives us an empty path component, leading to weirdness + val prefix = "opentelemetry-" + pathParts.subList(0, pathParts.lastIndex).joinToString("-") + val singularPrefix = "opentelemetry-" + pathParts .subList(0, pathParts.lastIndex) .joinToString("-") { s -> s.removeSuffix("s") } pathParts[pathParts.lastIndex] = pathParts.last() From 048d73458ec98f2ee246d7adc398b569f60522d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20Neum=C3=BCller?= Date: Mon, 13 Sep 2021 17:49:55 +0200 Subject: [PATCH 4/4] Remove debug println. --- settings.gradle.kts | 1 - 1 file changed, 1 deletion(-) diff --git a/settings.gradle.kts b/settings.gradle.kts index 9fc9654aa4a..0faa197ceb1 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -90,7 +90,6 @@ fun patchNames(rootProject: ProjectDescriptor) { .removePrefix("-") .ifEmpty { "all" } it.projectDir = file(pathParts.joinToString("/")) - println("Directory of ${it.path} is ${it.projectDir}") } patchNames(it) }