diff --git a/api/all/build.gradle.kts b/api/all/build.gradle.kts index 2945d1fd09..5c003c4ef6 100644 --- a/api/all/build.gradle.kts +++ b/api/all/build.gradle.kts @@ -2,7 +2,7 @@ plugins { id("java-library") id("maven-publish") - id("me.champeau.gradle.jmh") + id("me.champeau.jmh") id("ru.vyarus.animalsniffer") } diff --git a/api/build.gradle.kts b/api/build.gradle.kts index 35ea4e768f..29b0b3361d 100644 --- a/api/build.gradle.kts +++ b/api/build.gradle.kts @@ -1,9 +1,10 @@ subprojects { // Workaround https://github.com/gradle/gradle/issues/847 group = "io.opentelemetry.api" + val proj = this plugins.withId("java") { configure { - archivesBaseName = "opentelemetry-api-${project.name}" + archivesBaseName = "opentelemetry-api-${proj.name}" } } } diff --git a/api/metrics/build.gradle.kts b/api/metrics/build.gradle.kts index cb28d6e09a..501fa43578 100644 --- a/api/metrics/build.gradle.kts +++ b/api/metrics/build.gradle.kts @@ -2,7 +2,7 @@ plugins { id("java-library") id("maven-publish") - id("me.champeau.gradle.jmh") + id("me.champeau.jmh") id("ru.vyarus.animalsniffer") } diff --git a/build.gradle.kts b/build.gradle.kts index 1438c1f9dd..32fba65086 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -2,7 +2,7 @@ import com.diffplug.gradle.spotless.SpotlessExtension import com.google.protobuf.gradle.* import de.marcphilipp.gradle.nexus.NexusPublishExtension import io.morethan.jmhreport.gradle.JmhReportExtension -import me.champeau.gradle.JMHPluginExtension +import me.champeau.jmh.JmhParameters import me.champeau.gradle.japicmp.JapicmpTask import nebula.plugin.release.git.opinion.Strategies import net.ltgt.gradle.errorprone.CheckSeverity @@ -24,7 +24,7 @@ plugins { id("com.google.protobuf") apply false id("de.marcphilipp.nexus-publish") apply false id("io.morethan.jmhreport") apply false - id("me.champeau.gradle.jmh") apply false + id("me.champeau.jmh") apply false id("net.ltgt.errorprone") apply false id("net.ltgt.nullaway") apply false id("ru.vyarus.animalsniffer") apply false @@ -142,7 +142,7 @@ subprojects { } configure { - toolVersion = "0.8.6" + toolVersion = "0.8.7" } val javaToolchains = the() @@ -361,14 +361,19 @@ subprojects { } } + val dependencyManagement by configurations.creating { + isCanBeConsumed = false + isCanBeResolved = false + isVisible = false + } + dependencies { - configurations.configureEach { - // Gradle and newer plugins will set these configuration properties correctly. - if (isCanBeResolved && !isCanBeConsumed - // Older ones (like JMH) may not, so check the name as well. - // Kotlin compiler classpaths don't support BOM nor need it. - || name.endsWith("Classpath") && !name.startsWith("kotlin")) { - add(name, platform(project(":dependencyManagement"))) + add(dependencyManagement.name, platform(project(":dependencyManagement"))) + afterEvaluate { + configurations.configureEach { + if (isCanBeResolved && !isCanBeConsumed) { + extendsFrom(dependencyManagement) + } } } @@ -442,7 +447,7 @@ subprojects { } } - plugins.withId("me.champeau.gradle.jmh") { + plugins.withId("me.champeau.jmh") { // Always include the jmhreport plugin and run it after jmh task. plugins.apply("io.morethan.jmhreport") dependencies { @@ -453,16 +458,16 @@ subprojects { // invoke jmh on a single benchmark class like so: // ./gradlew -PjmhIncludeSingleClass=StatsTraceContextBenchmark clean :grpc-core:jmh - configure { - failOnError = true - resultFormat = "JSON" + configure { + failOnError.set(true) + resultFormat.set("JSON") // Otherwise an error will happen: // Could not expand ZIP 'byte-buddy-agent-1.9.7.jar'. - isIncludeTests = false - profilers = listOf("gc") + includeTests.set(false) + profilers.add("gc") val jmhIncludeSingleClass: String? by project if (jmhIncludeSingleClass != null) { - include = listOf(jmhIncludeSingleClass) + includes.add(jmhIncludeSingleClass as String) } } @@ -472,6 +477,12 @@ subprojects { } tasks { + // TODO(anuraaga): Unclear why this is triggering even though there don't seem to + // be duplicates, possibly a bug in JMH plugin. + named("processJmhResources") { + duplicatesStrategy = DuplicatesStrategy.EXCLUDE + } + named("jmh") { finalizedBy(named("jmhReport")) } diff --git a/context/build.gradle.kts b/context/build.gradle.kts index ae14923e3f..9f66f5743f 100644 --- a/context/build.gradle.kts +++ b/context/build.gradle.kts @@ -2,7 +2,7 @@ plugins { id("java-library") id("maven-publish") - id("me.champeau.gradle.jmh") + id("me.champeau.jmh") id("org.unbroken-dome.test-sets") id("ru.vyarus.animalsniffer") } diff --git a/docs/apidiffs/current_vs_latest/opentelemetry-extension-kotlin.txt b/docs/apidiffs/current_vs_latest/opentelemetry-extension-kotlin.txt index df26146497..094355074b 100644 --- a/docs/apidiffs/current_vs_latest/opentelemetry-extension-kotlin.txt +++ b/docs/apidiffs/current_vs_latest/opentelemetry-extension-kotlin.txt @@ -1,2 +1,10 @@ Comparing source compatibility of against -No changes. \ No newline at end of file +=== UNCHANGED CLASS: PUBLIC FINAL io.opentelemetry.extension.kotlin.ContextExtensionsKt (not serializable) + === CLASS FILE FORMAT VERSION: 52.0 <- 52.0 + *** MODIFIED ANNOTATION: kotlin.Metadata + --- REMOVED ELEMENT: bv=1,0,3 (-) + *** MODIFIED ELEMENT: mv=1,5,1 (<- 1,4,1) + === UNCHANGED ELEMENT: k=2 + === UNCHANGED ELEMENT: d1=�� � ��� ��� ��� ���� ����0�*�0�� ����0�*�0�� ����0�*�0�¨�� + === UNCHANGED ELEMENT: d2=asContextElement,Lkotlin/coroutines/CoroutineContext;,Lio/opentelemetry/context/Context;,Lio/opentelemetry/context/ImplicitContextKeyed;,getOpenTelemetryContext,opentelemetry-extension-kotlin + +++ NEW ELEMENT: xi=48 (+) diff --git a/exporters/build.gradle.kts b/exporters/build.gradle.kts index b49c068a1a..38f6851f8f 100644 --- a/exporters/build.gradle.kts +++ b/exporters/build.gradle.kts @@ -1,9 +1,10 @@ subprojects { // https://github.com/gradle/gradle/issues/847 group = "io.opentelemetry.exporters" + val proj = this plugins.withId("java") { configure { - archivesBaseName = "opentelemetry-exporter-${project.name}" + archivesBaseName = "opentelemetry-exporter-${proj.name}" } } } diff --git a/exporters/otlp/all/build.gradle.kts b/exporters/otlp/all/build.gradle.kts index ff6fb865c8..a8531742a3 100644 --- a/exporters/otlp/all/build.gradle.kts +++ b/exporters/otlp/all/build.gradle.kts @@ -2,7 +2,7 @@ plugins { `java-library` `maven-publish` - id("me.champeau.gradle.jmh") + id("me.champeau.jmh") id("ru.vyarus.animalsniffer") } diff --git a/exporters/otlp/build.gradle.kts b/exporters/otlp/build.gradle.kts index 11be44a2dc..1c405515a0 100644 --- a/exporters/otlp/build.gradle.kts +++ b/exporters/otlp/build.gradle.kts @@ -1,7 +1,8 @@ subprojects { + val proj = this plugins.withId("java") { configure { - archivesBaseName = "opentelemetry-exporter-otlp-${project.name}" + archivesBaseName = "opentelemetry-exporter-otlp-${proj.name}" } } } diff --git a/exporters/otlp/trace/build.gradle.kts b/exporters/otlp/trace/build.gradle.kts index a162e25192..e2768ee10b 100644 --- a/exporters/otlp/trace/build.gradle.kts +++ b/exporters/otlp/trace/build.gradle.kts @@ -2,7 +2,7 @@ plugins { `java-library` `maven-publish` - id("me.champeau.gradle.jmh") + id("me.champeau.jmh") id("org.unbroken-dome.test-sets") id("ru.vyarus.animalsniffer") } diff --git a/extensions/build.gradle.kts b/extensions/build.gradle.kts index 64b27f4050..d282c4c54d 100644 --- a/extensions/build.gradle.kts +++ b/extensions/build.gradle.kts @@ -1,7 +1,8 @@ subprojects { + val proj = this plugins.withId("java") { configure { - archivesBaseName = "opentelemetry-extension-${project.name}" + archivesBaseName = "opentelemetry-extension-${proj.name}" } } } diff --git a/extensions/kotlin/build.gradle.kts b/extensions/kotlin/build.gradle.kts index 8c45acee76..931286b53c 100644 --- a/extensions/kotlin/build.gradle.kts +++ b/extensions/kotlin/build.gradle.kts @@ -4,7 +4,7 @@ plugins { `java-library` `maven-publish` - id("me.champeau.gradle.jmh") + id("me.champeau.jmh") id("org.jetbrains.kotlin.jvm") id("org.unbroken-dome.test-sets") id("ru.vyarus.animalsniffer") diff --git a/extensions/trace-propagators/build.gradle.kts b/extensions/trace-propagators/build.gradle.kts index 997cb6281e..2933f417a6 100644 --- a/extensions/trace-propagators/build.gradle.kts +++ b/extensions/trace-propagators/build.gradle.kts @@ -3,7 +3,7 @@ plugins { `maven-publish` id("ru.vyarus.animalsniffer") - id("me.champeau.gradle.jmh") + id("me.champeau.jmh") } description = "OpenTelemetry Extension : Trace Propagators" diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index a0a653ca90..ff541e5974 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-bin.zip -distributionSha256Sum=7faa7198769f872826c8ef4f1450f839ec27f0b4d5d1e51bade63667cbccd205 +distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.1-bin.zip +distributionSha256Sum=dccda8aa069563c8ba2f6cdfd0777df0e34a5b4d15138ca8b9757e94f4e8a8cb zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/sdk-extensions/aws/build.gradle.kts b/sdk-extensions/aws/build.gradle.kts index e42d2aa2fe..e921ed1160 100644 --- a/sdk-extensions/aws/build.gradle.kts +++ b/sdk-extensions/aws/build.gradle.kts @@ -2,7 +2,7 @@ plugins { `java-library` `maven-publish` - id("me.champeau.gradle.jmh") + id("me.champeau.jmh") } description = "OpenTelemetry SDK AWS Instrumentation Support" diff --git a/sdk-extensions/build.gradle.kts b/sdk-extensions/build.gradle.kts index a4ed245ecd..aa8eb58653 100644 --- a/sdk-extensions/build.gradle.kts +++ b/sdk-extensions/build.gradle.kts @@ -1,7 +1,8 @@ subprojects { + val proj = this plugins.withId("java") { configure { - archivesBaseName = "opentelemetry-sdk-extension-${project.name}" + archivesBaseName = "opentelemetry-sdk-extension-${proj.name}" } } } diff --git a/sdk-extensions/tracing-incubator/build.gradle.kts b/sdk-extensions/tracing-incubator/build.gradle.kts index 51a4c20769..62876432b0 100644 --- a/sdk-extensions/tracing-incubator/build.gradle.kts +++ b/sdk-extensions/tracing-incubator/build.gradle.kts @@ -2,7 +2,7 @@ plugins { `java-library` `maven-publish` - id("me.champeau.gradle.jmh") + id("me.champeau.jmh") id("ru.vyarus.animalsniffer") } diff --git a/sdk-extensions/zpages/build.gradle.kts b/sdk-extensions/zpages/build.gradle.kts index 58ff62c67a..044fe6f79c 100644 --- a/sdk-extensions/zpages/build.gradle.kts +++ b/sdk-extensions/zpages/build.gradle.kts @@ -2,7 +2,7 @@ plugins { `java-library` `maven-publish` - id("me.champeau.gradle.jmh") + id("me.champeau.jmh") } description = "OpenTelemetry - zPages" diff --git a/sdk/all/build.gradle.kts b/sdk/all/build.gradle.kts index 196f9549ca..480e584925 100644 --- a/sdk/all/build.gradle.kts +++ b/sdk/all/build.gradle.kts @@ -2,7 +2,7 @@ plugins { id("java-library") id("maven-publish") - id("me.champeau.gradle.jmh") + id("me.champeau.jmh") id("ru.vyarus.animalsniffer") } diff --git a/sdk/build.gradle.kts b/sdk/build.gradle.kts index c51069a921..781be18938 100644 --- a/sdk/build.gradle.kts +++ b/sdk/build.gradle.kts @@ -1,9 +1,10 @@ subprojects { // Workaround https://github.com/gradle/gradle/issues/847 group = "io.opentelemetry.sdk" + val proj = this plugins.withId("java") { configure { - archivesBaseName = "opentelemetry-sdk-${project.name}" + archivesBaseName = "opentelemetry-sdk-${proj.name}" } } } diff --git a/sdk/metrics/build.gradle.kts b/sdk/metrics/build.gradle.kts index 68e2744c58..e6f051320d 100644 --- a/sdk/metrics/build.gradle.kts +++ b/sdk/metrics/build.gradle.kts @@ -2,7 +2,7 @@ plugins { id("java-library") id("maven-publish") - id("me.champeau.gradle.jmh") + id("me.champeau.jmh") // TODO(anuraaga): Enable animalsniffer by the time we are getting ready to release a stable // version. Long/DoubleAdder are not part of Android API 21 which is our current target. diff --git a/sdk/trace/build.gradle.kts b/sdk/trace/build.gradle.kts index 476eaeeddd..c59fcbde88 100644 --- a/sdk/trace/build.gradle.kts +++ b/sdk/trace/build.gradle.kts @@ -2,7 +2,7 @@ plugins { id("java-library") id("maven-publish") - id("me.champeau.gradle.jmh") + id("me.champeau.jmh") id("ru.vyarus.animalsniffer") } diff --git a/settings.gradle.kts b/settings.gradle.kts index 3a79ffa905..22d35cd4b0 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -2,20 +2,20 @@ pluginManagement { plugins { id("com.diffplug.spotless") version "5.11.1" id("com.github.ben-manes.versions") version "0.38.0" - id("com.github.johnrengelman.shadow") version "6.1.0" - id("com.google.protobuf") version "0.8.15" + id("com.github.johnrengelman.shadow") version "7.0.0" + id("com.google.protobuf") version "0.8.16" id("com.gradle.enterprise") version "3.6" id("de.marcphilipp.nexus-publish") version "0.4.0" id("de.undercouch.download") version "4.1.1" id("io.codearte.nexus-staging") version "0.30.0" id("io.morethan.jmhreport") version "0.9.0" - id("me.champeau.gradle.jmh") version "0.5.3" + id("me.champeau.jmh") version "0.6.4" id("nebula.release") version "15.3.1" id("net.ltgt.errorprone") version "2.0.1" id("net.ltgt.nullaway") version "1.1.0" id("org.checkerframework") version "0.5.20" - id("org.jetbrains.kotlin.jvm") version "1.4.21" - id("org.unbroken-dome.test-sets") version "3.0.1" + id("org.jetbrains.kotlin.jvm") version "1.5.0" + id("org.unbroken-dome.test-sets") version "4.0.0" id("ru.vyarus.animalsniffer") version "1.5.3" id("me.champeau.gradle.japicmp") version "0.2.9" }