Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/scripts/update-sdk-version.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
8 changes: 5 additions & 3 deletions .github/scripts/update-version.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
87 changes: 0 additions & 87 deletions examples/distro/build.gradle

This file was deleted.

88 changes: 88 additions & 0 deletions examples/distro/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -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.24.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.24.0-SNAPSHOT",
"opentelemetryJavaagentAlpha" to "2.24.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<com.diffplug.gradle.spotless.SpotlessExtension> {
java {
googleJavaFormat()
licenseHeaderFile(rootProject.file("../../buildscripts/spotless.license.java"), "(package|import|public)")
target("src/**/*.java")
}
}

plugins.withType<JavaPlugin> {
dependencies {
add("implementation", platform("io.opentelemetry:opentelemetry-bom:${versions["opentelemetrySdk"]}"))

// these serve as a test of the instrumentation boms
add("implementation", platform("io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:${versions["opentelemetryJavaagent"]}"))
add("implementation", platform("io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:${versions["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>("test") {
useJUnitPlatform()
}

tasks.named<JavaCompile>("compileJava") {
options.release.set(8)
}
}
Loading