From 295563cd3977cebbc54ec53f837375a181ab429e Mon Sep 17 00:00:00 2001 From: Jack Berg Date: Wed, 29 Jan 2025 11:08:35 -0600 Subject: [PATCH 1/3] Fix gradle warnings --- build.gradle.kts | 6 +++--- .../src/main/kotlin/otel.spotless-conventions.gradle.kts | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 0aff62ef..c6d2e3b4 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -66,7 +66,7 @@ val schemaUrl = "https://opentelemetry.io/schemas/$semanticConventionsVersion" val downloadSemanticConventions by tasks.registering(Download::class) { src(semanticConventionsRepoZip) - dest("$buildDir/semantic-conventions-${semanticConventionsVersion}/semantic-conventions.zip") + dest("${layout.buildDirectory.asFile.get()}/semantic-conventions-${semanticConventionsVersion}/semantic-conventions.zip") overwrite(false) } @@ -79,7 +79,7 @@ val unzipConfigurationSchema by tasks.registering(Copy::class) { val pathParts = path.split("/") path = pathParts.subList(1, pathParts.size).joinToString("/") }) - into("$buildDir/semantic-conventions-${semanticConventionsVersion}/") + into("${layout.buildDirectory.asFile.get()}/semantic-conventions-${semanticConventionsVersion}/") } fun generateTask(taskName: String, incubating: Boolean) { @@ -105,7 +105,7 @@ fun generateTask(taskName: String, incubating: Boolean) { val weaver_args = listOf( "--rm", "--platform=linux/x86_64", - "--mount", "type=bind,source=$buildDir/semantic-conventions-${semanticConventionsVersion}/model,target=/home/weaver/source,readonly", + "--mount", "type=bind,source=${layout.buildDirectory.asFile.get()}/semantic-conventions-${semanticConventionsVersion}/model,target=/home/weaver/source,readonly", "--mount", "type=bind,source=$projectDir/buildscripts/templates,target=/home/weaver/templates,readonly", "--mount", "type=bind,source=$projectDir/$outputDir,target=/home/weaver/target", "otel/weaver:$generatorVersion", diff --git a/buildSrc/src/main/kotlin/otel.spotless-conventions.gradle.kts b/buildSrc/src/main/kotlin/otel.spotless-conventions.gradle.kts index 5aec55a0..b1c39dcd 100644 --- a/buildSrc/src/main/kotlin/otel.spotless-conventions.gradle.kts +++ b/buildSrc/src/main/kotlin/otel.spotless-conventions.gradle.kts @@ -70,7 +70,7 @@ spotless { "*.sh", "src/**/*.properties", ) - indentWithSpaces() + leadingTabsToSpaces() trimTrailingWhitespace() endWithNewline() } From be78bf605522b76022fdf9f2578e0590523fb5b8 Mon Sep 17 00:00:00 2001 From: Jack Berg Date: Thu, 30 Jan 2025 10:50:02 -0600 Subject: [PATCH 2/3] Improve syntax --- build.gradle.kts | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index c6d2e3b4..b143f3e2 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -66,7 +66,7 @@ val schemaUrl = "https://opentelemetry.io/schemas/$semanticConventionsVersion" val downloadSemanticConventions by tasks.registering(Download::class) { src(semanticConventionsRepoZip) - dest("${layout.buildDirectory.asFile.get()}/semantic-conventions-${semanticConventionsVersion}/semantic-conventions.zip") + dest(layout.buildDirectory.file("semantic-conventions-${semanticConventionsVersion}/semantic-conventions.zip")) overwrite(false) } @@ -79,7 +79,7 @@ val unzipConfigurationSchema by tasks.registering(Copy::class) { val pathParts = path.split("/") path = pathParts.subList(1, pathParts.size).joinToString("/") }) - into("${layout.buildDirectory.asFile.get()}/semantic-conventions-${semanticConventionsVersion}/") + into(layout.buildDirectory.file("semantic-conventions-${semanticConventionsVersion}/")) } fun generateTask(taskName: String, incubating: Boolean) { @@ -102,10 +102,11 @@ fun generateTask(taskName: String, incubating: Boolean) { val gid = unix.getGid() // $(id -g $USERNAME) listOf("-u", "$uid:$gid") } + val modelPath = layout.buildDirectory.file("semantic-conventions-${semanticConventionsVersion}/model").get() val weaver_args = listOf( "--rm", "--platform=linux/x86_64", - "--mount", "type=bind,source=${layout.buildDirectory.asFile.get()}/semantic-conventions-${semanticConventionsVersion}/model,target=/home/weaver/source,readonly", + "--mount", "type=bind,source=${modelPath},target=/home/weaver/source,readonly", "--mount", "type=bind,source=$projectDir/buildscripts/templates,target=/home/weaver/templates,readonly", "--mount", "type=bind,source=$projectDir/$outputDir,target=/home/weaver/target", "otel/weaver:$generatorVersion", From 7ec67855c8a259dc04652c19fcabeff4d29abc91 Mon Sep 17 00:00:00 2001 From: Jack Berg Date: Thu, 30 Jan 2025 15:39:15 -0600 Subject: [PATCH 3/3] file to dir where appropriate --- build.gradle.kts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index b143f3e2..2734226a 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -79,7 +79,7 @@ val unzipConfigurationSchema by tasks.registering(Copy::class) { val pathParts = path.split("/") path = pathParts.subList(1, pathParts.size).joinToString("/") }) - into(layout.buildDirectory.file("semantic-conventions-${semanticConventionsVersion}/")) + into(layout.buildDirectory.dir("semantic-conventions-${semanticConventionsVersion}/")) } fun generateTask(taskName: String, incubating: Boolean) { @@ -102,7 +102,7 @@ fun generateTask(taskName: String, incubating: Boolean) { val gid = unix.getGid() // $(id -g $USERNAME) listOf("-u", "$uid:$gid") } - val modelPath = layout.buildDirectory.file("semantic-conventions-${semanticConventionsVersion}/model").get() + val modelPath = layout.buildDirectory.dir("semantic-conventions-${semanticConventionsVersion}/model").get() val weaver_args = listOf( "--rm", "--platform=linux/x86_64",