diff --git a/.github/scripts/update-sdk-version.sh b/.github/scripts/update-sdk-version.sh index 5f9467dca58c..11c10eeebc68 100755 --- a/.github/scripts/update-sdk-version.sh +++ b/.github/scripts/update-sdk-version.sh @@ -4,6 +4,6 @@ version=$1 sed -Ei "s/val otelSdkVersion = \"[^\"]*\"/val otelSdkVersion = \"$version\"/" dependencyManagement/build.gradle.kts -sed -Ei "s/(opentelemetrySdk *: )\"[^\"]*\"/\1\"$version\"/" examples/distro/build.gradle +sed -Ei "s/(\"opentelemetrySdk\" to )\"[^\"]*\"/\1\"$version\"/" examples/distro/build.gradle.kts sed -Ei "s/(opentelemetrySdk *: )\"[^\"]*\"/\1\"$version\"/" examples/extension/build.gradle diff --git a/.github/scripts/update-version.sh b/.github/scripts/update-version.sh index 748dc542adba..a66eb8305ebd 100755 --- a/.github/scripts/update-version.sh +++ b/.github/scripts/update-version.sh @@ -11,10 +11,12 @@ fi sed -Ei "s/val stableVersion = \"[^\"]*\"/val stableVersion = \"$version\"/" version.gradle.kts sed -Ei "s/val alphaVersion = \"[^\"]*\"/val alphaVersion = \"$alpha_version\"/" version.gradle.kts -sed -Ei "s/(opentelemetryJavaagent *: )\"[^\"]*\"/\1\"$version\"/" examples/distro/build.gradle -sed -Ei "s/(opentelemetryJavaagentAlpha *: )\"[^\"]*\"/\1\"$alpha_version\"/" examples/distro/build.gradle +sed -Ei "s/(\"opentelemetryJavaagent\" to )\"[^\"]*\"/\1\"$version\"/" examples/distro/build.gradle.kts +sed -Ei "s/(\"opentelemetryJavaagentAlpha\" to )\"[^\"]*\"/\1\"$alpha_version\"/" examples/distro/build.gradle.kts + +sed -Ei "s/(classpath\(\"io\.opentelemetry\.instrumentation:gradle-plugins:)[^\"]*(\"\)\))/\1$alpha_version\2/" examples/distro/build.gradle.kts + -sed -Ei "s/(classpath \"io.opentelemetry.instrumentation:gradle-plugins:)[^\"]*\"/\1$alpha_version\"/" examples/distro/build.gradle sed -Ei "s/(opentelemetryJavaagent *: )\"[^\"]*\"/\1\"$version\"/" examples/extension/build.gradle sed -Ei "s/(opentelemetryJavaagentAlpha *: )\"[^\"]*\"/\1\"$alpha_version\"/" examples/extension/build.gradle diff --git a/examples/distro/build.gradle b/examples/distro/build.gradle deleted file mode 100644 index 4a8fbb5e5838..000000000000 --- a/examples/distro/build.gradle +++ /dev/null @@ -1,87 +0,0 @@ -group 'io.opentelemetry.example' -version '1.0-SNAPSHOT' - -buildscript { - repositories { - maven { - url "https://plugins.gradle.org/m2/" - } - maven { - name = "sonatype" - url = uri("https://central.sonatype.com/repository/maven-snapshots/") - } - } - dependencies { - classpath "com.diffplug.spotless:spotless-plugin-gradle:8.1.0" - classpath "com.gradleup.shadow:shadow-gradle-plugin:9.3.1" - classpath "io.opentelemetry.instrumentation:gradle-plugins:2.25.0-alpha-SNAPSHOT" - } -} - -subprojects { - version = rootProject.version - - apply plugin: "java" - apply plugin: "com.diffplug.spotless" - - ext { - versions = [ - // this line is managed by .github/scripts/update-sdk-version.sh - opentelemetrySdk : "1.58.0", - - // these lines are managed by .github/scripts/update-version.sh - opentelemetryJavaagent : "2.25.0-SNAPSHOT", - opentelemetryJavaagentAlpha: "2.25.0-alpha-SNAPSHOT", - - autoservice : "1.1.1" - ] - - deps = [ - autoservice: [ - "com.google.auto.service:auto-service:${versions.autoservice}", - "com.google.auto.service:auto-service-annotations:${versions.autoservice}", - ] - ] - } - - repositories { - mavenCentral() - maven { - name = "sonatype" - url = uri("https://central.sonatype.com/repository/maven-snapshots/") - } - } - - spotless { - java { - googleJavaFormat() - licenseHeaderFile(rootProject.file("../../buildscripts/spotless.license.java"), "(package|import|public)") - target("src/**/*.java") - } - } - - dependencies { - implementation(platform("io.opentelemetry:opentelemetry-bom:${versions.opentelemetrySdk}")) - - // these serve as a test of the instrumentation boms - implementation(platform("io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:${versions.opentelemetryJavaagent}")) - implementation(platform("io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:${versions.opentelemetryJavaagentAlpha}")) - - testImplementation("org.mockito:mockito-core:5.21.0") - - testImplementation(enforcedPlatform("org.junit:junit-bom:5.14.2")) - testImplementation("org.junit.jupiter:junit-jupiter-api") - testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine") - testRuntimeOnly("org.junit.platform:junit-platform-launcher") - } - - tasks { - test { - useJUnitPlatform() - } - - compileJava { - options.release.set(8) - } - } -} diff --git a/examples/distro/build.gradle.kts b/examples/distro/build.gradle.kts new file mode 100644 index 000000000000..fac53c43a50d --- /dev/null +++ b/examples/distro/build.gradle.kts @@ -0,0 +1,88 @@ +group = "io.opentelemetry.example" +version = "1.0-SNAPSHOT" + +buildscript { + repositories { + maven { + url = uri("https://plugins.gradle.org/m2/") + } + maven { + name = "sonatype" + url = uri("https://central.sonatype.com/repository/maven-snapshots/") + } + } + dependencies { + classpath("com.diffplug.spotless:spotless-plugin-gradle:8.1.0") + classpath("com.gradleup.shadow:shadow-gradle-plugin:9.3.1") + classpath("io.opentelemetry.instrumentation:gradle-plugins:2.25.0-alpha-SNAPSHOT") + } +} + +subprojects { + version = rootProject.version + + apply(plugin = "java") + apply(plugin = "com.diffplug.spotless") + + val versions = mapOf( + // this line is managed by .github/scripts/update-sdk-version.sh + "opentelemetrySdk" to "1.58.0", + + // these lines are managed by .github/scripts/update-version.sh + "opentelemetryJavaagent" to "2.25.0-SNAPSHOT", + "opentelemetryJavaagentAlpha" to "2.25.0-alpha-SNAPSHOT", + + "autoservice" to "1.1.1" + ) + + val deps = mapOf( + "autoservice" to listOf( + "com.google.auto.service:auto-service:${versions["autoservice"]}", + "com.google.auto.service:auto-service-annotations:${versions["autoservice"]}" + ) + ) + + extra["versions"] = versions + extra["deps"] = deps + + repositories { + mavenCentral() + maven { + name = "sonatype" + url = uri("https://central.sonatype.com/repository/maven-snapshots/") + } + } + + configure { + java { + googleJavaFormat() + licenseHeaderFile(rootProject.file("../../buildscripts/spotless.license.java"), "(package|import|public)") + target("src/**/*.java") + } + } + + plugins.withId("java") { + dependencies { + add("implementation", platform("io.opentelemetry:opentelemetry-bom:${versions.getValue("opentelemetrySdk")}")) + + // these serve as a test of the instrumentation boms + add("implementation", platform("io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:${versions.getValue("opentelemetryJavaagent")}")) + add("implementation", platform("io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:${versions.getValue("opentelemetryJavaagentAlpha")}")) + + add("testImplementation", "org.mockito:mockito-core:5.21.0") + + add("testImplementation", enforcedPlatform("org.junit:junit-bom:5.14.2")) + add("testImplementation", "org.junit.jupiter:junit-jupiter-api") + add("testRuntimeOnly", "org.junit.jupiter:junit-jupiter-engine") + add("testRuntimeOnly", "org.junit.platform:junit-platform-launcher") + } + } + + tasks.named("test") { + useJUnitPlatform() + } + + tasks.named("compileJava") { + options.release.set(8) + } +}