Skip to content

Commit dfb4a62

Browse files
dependabot[bot]dependabot[bot]
authored
Bump spotless-plugin-gradle from 6.12.1 to 6.13.0 (#7591)
1 parent 6741c95 commit dfb4a62

File tree

16 files changed

+141
-37
lines changed

16 files changed

+141
-37
lines changed

‎.editorconfig

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ charset = utf-8
33
end_of_line = lf
44
indent_size = 2
55
indent_style = space
6-
insert_final_newline = false
6+
insert_final_newline = true
77
max_line_length = 100
88
tab_width = 2
99
ij_continuation_indent_size = 4

‎conventions/build.gradle.kts

+17-3
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,26 @@ plugins {
77
spotless {
88
java {
99
googleJavaFormat()
10-
licenseHeaderFile(rootProject.file("../buildscripts/spotless.license.java"), "(package|import|public)")
10+
licenseHeaderFile(
11+
rootProject.file("../buildscripts/spotless.license.java"),
12+
"(package|import|public)"
13+
)
1114
target("src/**/*.java")
1215
}
1316
kotlinGradle {
1417
// not sure why it's not using the indent settings from .editorconfig
15-
ktlint().editorConfigOverride(mapOf("indent_size" to "2", "continuation_indent_size" to "2", "disabled_rules" to "no-wildcard-imports"))
18+
ktlint().editorConfigOverride(mapOf(
19+
"indent_size" to "2",
20+
"continuation_indent_size" to "2",
21+
"max_line_length" to "160",
22+
"ktlint_standard_no-wildcard-imports" to "disabled",
23+
// ktlint does not break up long lines, it just fails on them
24+
"ktlint_standard_max-line-length" to "disabled",
25+
// ktlint makes it *very* hard to locate where this actually happened
26+
"ktlint_standard_trailing-comma-on-call-site" to "disabled",
27+
// also very hard to find out where this happens
28+
"ktlint_standard_wrapping" to "disabled"
29+
))
1630
target("**/*.gradle.kts")
1731
}
1832
}
@@ -38,7 +52,7 @@ dependencies {
3852
implementation("org.apache.maven:maven-aether-provider:3.3.9")
3953

4054
// When updating, update above in plugins too
41-
implementation("com.diffplug.spotless:spotless-plugin-gradle:6.12.1")
55+
implementation("com.diffplug.spotless:spotless-plugin-gradle:6.13.0")
4256
implementation("com.google.guava:guava:31.1-jre")
4357
implementation("gradle.plugin.com.google.protobuf:protobuf-gradle-plugin:0.8.18")
4458
implementation("gradle.plugin.com.github.johnrengelman:shadow:7.1.2")

‎conventions/src/main/kotlin/io.opentelemetry.instrumentation.base.gradle.kts

+7-7
Original file line numberDiff line numberDiff line change
@@ -34,13 +34,13 @@ extra["testLatestDeps"] = testLatestDeps
3434
abstract class TestLatestDepsRule : ComponentMetadataRule {
3535
override fun execute(context: ComponentMetadataContext) {
3636
val version = context.details.id.version
37-
if (version.contains("-alpha", true)
38-
|| version.contains("-beta", true)
39-
|| version.contains("-rc", true)
40-
|| version.contains("-m", true) // e.g. spring milestones are published to grails repo
41-
|| version.contains(".alpha", true) // e.g. netty
42-
|| version.contains(".beta", true) // e.g. hibernate
43-
|| version.contains(".cr", true) // e.g. hibernate
37+
if (version.contains("-alpha", true) ||
38+
version.contains("-beta", true) ||
39+
version.contains("-rc", true) ||
40+
version.contains("-m", true) || // e.g. spring milestones are published to grails repo
41+
version.contains(".alpha", true) || // e.g. netty
42+
version.contains(".beta", true) || // e.g. hibernate
43+
version.contains(".cr", true) // e.g. hibernate
4444
) {
4545
context.details.status = "milestone"
4646
}

‎conventions/src/main/kotlin/otel.java-conventions.gradle.kts

+9-4
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,9 @@ val DEFAULT_JAVA_VERSION = JavaVersion.VERSION_17
3131

3232
java {
3333
toolchain {
34-
languageVersion.set(otelJava.minJavaVersionSupported.map { JavaLanguageVersion.of(Math.max(it.majorVersion.toInt(), DEFAULT_JAVA_VERSION.majorVersion.toInt())) })
34+
languageVersion.set(
35+
otelJava.minJavaVersionSupported.map { JavaLanguageVersion.of(Math.max(it.majorVersion.toInt(), DEFAULT_JAVA_VERSION.majorVersion.toInt())) }
36+
)
3537
}
3638

3739
// See https://docs.gradle.org/current/userguide/upgrading_version_5.html, Automatic target JVM version
@@ -150,7 +152,6 @@ testing {
150152
runtimeOnly("org.junit.vintage:junit-vintage-engine")
151153
implementation("org.junit-pioneer:junit-pioneer")
152154

153-
154155
implementation("org.assertj:assertj-core")
155156
implementation("org.awaitility:awaitility")
156157
implementation("org.mockito:mockito-core")
@@ -268,7 +269,9 @@ gradle.sharedServices.registerIfAbsent("testcontainersBuildService", Testcontain
268269
maxParallelUsages.convention(2)
269270
}
270271

271-
val resourceClassesCsv = listOf("Host", "Os", "Process", "ProcessRuntime").map { "io.opentelemetry.sdk.extension.resources.${it}ResourceProvider" }.joinToString(",")
272+
val resourceNames = listOf("Host", "Os", "Process", "ProcessRuntime")
273+
val resourceClassesCsv = resourceNames.joinToString(",") { "io.opentelemetry.sdk.extension.resources.${it}ResourceProvider" }
274+
272275
tasks.withType<Test>().configureEach {
273276
useJUnitPlatform()
274277

@@ -400,7 +403,9 @@ configurations.configureEach {
400403
substitute(module("io.opentelemetry.instrumentation:opentelemetry-instrumentation-api")).using(project(":instrumentation-api"))
401404
substitute(module("io.opentelemetry.instrumentation:opentelemetry-instrumentation-api-semconv")).using(project(":instrumentation-api-semconv"))
402405
substitute(module("io.opentelemetry.instrumentation:opentelemetry-instrumentation-annotations")).using(project(":instrumentation-annotations"))
403-
substitute(module("io.opentelemetry.instrumentation:opentelemetry-instrumentation-annotations-support")).using(project(":instrumentation-annotations-support"))
406+
substitute(module("io.opentelemetry.instrumentation:opentelemetry-instrumentation-annotations-support")).using(
407+
project(":instrumentation-annotations-support")
408+
)
404409
substitute(module("io.opentelemetry.javaagent:opentelemetry-javaagent-bootstrap")).using(project(":javaagent-bootstrap"))
405410
substitute(module("io.opentelemetry.javaagent:opentelemetry-javaagent-extension-api")).using(project(":javaagent-extension-api"))
406411
substitute(module("io.opentelemetry.javaagent:opentelemetry-javaagent-tooling")).using(project(":javaagent-tooling"))

‎conventions/src/main/kotlin/otel.publish-conventions.gradle.kts

+3-3
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@ publishing {
2626
}
2727
artifactId = artifactPrefix(project, base.archivesName.get()) + base.archivesName.get()
2828

29-
if (groupId != "io.opentelemetry.instrumentation"
30-
&& groupId != "io.opentelemetry.javaagent"
31-
&& groupId != "io.opentelemetry.javaagent.instrumentation") {
29+
if (groupId != "io.opentelemetry.instrumentation" &&
30+
groupId != "io.opentelemetry.javaagent" &&
31+
groupId != "io.opentelemetry.javaagent.instrumentation") {
3232
throw GradleException("Unexpected groupId for this project or its parent ${project.parent}: $groupId")
3333
}
3434

‎conventions/src/main/kotlin/otel.spotless-conventions.gradle.kts

+45-6
Original file line numberDiff line numberDiff line change
@@ -7,33 +7,72 @@ plugins {
77
spotless {
88
java {
99
googleJavaFormat()
10-
licenseHeaderFile(rootProject.file("buildscripts/spotless.license.java"), "(package|import|public|// Includes work from:)")
10+
licenseHeaderFile(
11+
rootProject.file("buildscripts/spotless.license.java"),
12+
"(package|import|public|// Includes work from:)"
13+
)
1114
toggleOffOn()
1215
target("src/**/*.java")
1316
}
1417
plugins.withId("groovy") {
1518
groovy {
16-
licenseHeaderFile(rootProject.file("buildscripts/spotless.license.java"), "(package|import|class)")
19+
licenseHeaderFile(
20+
rootProject.file("buildscripts/spotless.license.java"),
21+
"(package|import|class)"
22+
)
1723
endWithNewline()
1824
}
1925
}
2026
plugins.withId("scala") {
2127
scala {
2228
scalafmt()
23-
licenseHeaderFile(rootProject.file("buildscripts/spotless.license.java"), "(package|import|public)")
29+
licenseHeaderFile(
30+
rootProject.file("buildscripts/spotless.license.java"),
31+
"(package|import|public)"
32+
)
2433
target("src/**/*.scala")
2534
}
2635
}
2736
plugins.withId("org.jetbrains.kotlin.jvm") {
2837
kotlin {
2938
// not sure why it's not using the indent settings from .editorconfig
30-
ktlint().editorConfigOverride(mapOf("indent_size" to "2", "continuation_indent_size" to "2", "disabled_rules" to "no-wildcard-imports,package-name"))
31-
licenseHeaderFile(rootProject.file("buildscripts/spotless.license.java"), "(package|import|class|// Includes work from:)")
39+
ktlint().editorConfigOverride(
40+
mapOf(
41+
"indent_size" to "2",
42+
"continuation_indent_size" to "2",
43+
"max_line_length" to "160",
44+
"ktlint_standard_no-wildcard-imports" to "disabled",
45+
"ktlint_standard_package-name" to "disabled",
46+
// ktlint does not break up long lines, it just fails on them
47+
"ktlint_standard_max-line-length" to "disabled",
48+
// ktlint makes it *very* hard to locate where this actually happened
49+
"ktlint_standard_trailing-comma-on-call-site" to "disabled",
50+
// also very hard to find out where this happens
51+
"ktlint_standard_wrapping" to "disabled"
52+
)
53+
)
54+
licenseHeaderFile(
55+
rootProject.file("buildscripts/spotless.license.java"),
56+
"(package|import|class|// Includes work from:)"
57+
)
3258
}
3359
}
3460
kotlinGradle {
3561
// not sure why it's not using the indent settings from .editorconfig
36-
ktlint().editorConfigOverride(mapOf("indent_size" to "2", "continuation_indent_size" to "2", "disabled_rules" to "no-wildcard-imports"))
62+
ktlint().editorConfigOverride(
63+
mapOf(
64+
"indent_size" to "2",
65+
"continuation_indent_size" to "2",
66+
"max_line_length" to "160",
67+
"ktlint_standard_no-wildcard-imports" to "disabled",
68+
// ktlint does not break up long lines, it just fails on them
69+
"ktlint_standard_max-line-length" to "disabled",
70+
// ktlint makes it *very* hard to locate where this actually happened
71+
"ktlint_standard_trailing-comma-on-call-site" to "disabled",
72+
// also very hard to find out where this happens
73+
"ktlint_standard_wrapping" to "disabled"
74+
)
75+
)
3776
}
3877
}
3978

‎instrumentation/azure-core/azure-core-1.14/javaagent/build.gradle.kts

+4-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,10 @@ muzzle {
1414
sourceSets {
1515
main {
1616
val shadedDep = project(":instrumentation:azure-core:azure-core-1.14:library-instrumentation-shaded")
17-
output.dir(shadedDep.file("build/extracted/shadow"), "builtBy" to ":instrumentation:azure-core:azure-core-1.14:library-instrumentation-shaded:extractShadowJar")
17+
output.dir(
18+
shadedDep.file("build/extracted/shadow"),
19+
"builtBy" to ":instrumentation:azure-core:azure-core-1.14:library-instrumentation-shaded:extractShadowJar"
20+
)
1821
}
1922
}
2023

‎instrumentation/azure-core/azure-core-1.19/javaagent/build.gradle.kts

+4-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,10 @@ muzzle {
1414
sourceSets {
1515
main {
1616
val shadedDep = project(":instrumentation:azure-core:azure-core-1.19:library-instrumentation-shaded")
17-
output.dir(shadedDep.file("build/extracted/shadow"), "builtBy" to ":instrumentation:azure-core:azure-core-1.19:library-instrumentation-shaded:extractShadowJar")
17+
output.dir(
18+
shadedDep.file("build/extracted/shadow"),
19+
"builtBy" to ":instrumentation:azure-core:azure-core-1.19:library-instrumentation-shaded:extractShadowJar"
20+
)
1821
}
1922
}
2023

‎instrumentation/couchbase/couchbase-3.1.6/tracing-opentelemetry-shaded/build.gradle.kts

+4-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,10 @@ tasks {
1616
// including only tracing-opentelemetry excludes its transitive dependencies
1717
include(dependency("com.couchbase.client:tracing-opentelemetry"))
1818
}
19-
relocate("com.couchbase.client.tracing.opentelemetry", "io.opentelemetry.javaagent.instrumentation.couchbase.v3_1_6.shaded.com.couchbase.client.tracing.opentelemetry")
19+
relocate(
20+
"com.couchbase.client.tracing.opentelemetry",
21+
"io.opentelemetry.javaagent.instrumentation.couchbase.v3_1_6.shaded.com.couchbase.client.tracing.opentelemetry"
22+
)
2023
}
2124

2225
val extractShadowJar by registering(Copy::class) {

‎instrumentation/couchbase/couchbase-3.1/tracing-opentelemetry-shaded/build.gradle.kts

+4-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,10 @@ tasks {
1616
// including only tracing-opentelemetry excludes its transitive dependencies
1717
include(dependency("com.couchbase.client:tracing-opentelemetry"))
1818
}
19-
relocate("com.couchbase.client.tracing.opentelemetry", "io.opentelemetry.javaagent.instrumentation.couchbase.v3_1.shaded.com.couchbase.client.tracing.opentelemetry")
19+
relocate(
20+
"com.couchbase.client.tracing.opentelemetry",
21+
"io.opentelemetry.javaagent.instrumentation.couchbase.v3_1.shaded.com.couchbase.client.tracing.opentelemetry"
22+
)
2023
}
2124

2225
val extractShadowJar by registering(Copy::class) {

‎instrumentation/couchbase/couchbase-3.2/tracing-opentelemetry-shaded/build.gradle.kts

+4-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,10 @@ tasks {
1616
// including only tracing-opentelemetry excludes its transitive dependencies
1717
include(dependency("com.couchbase.client:tracing-opentelemetry"))
1818
}
19-
relocate("com.couchbase.client.tracing.opentelemetry", "io.opentelemetry.javaagent.instrumentation.couchbase.v3_2.shaded.com.couchbase.client.tracing.opentelemetry")
19+
relocate(
20+
"com.couchbase.client.tracing.opentelemetry",
21+
"io.opentelemetry.javaagent.instrumentation.couchbase.v3_2.shaded.com.couchbase.client.tracing.opentelemetry"
22+
)
2023
}
2124

2225
val extractShadowJar by registering(Copy::class) {

‎instrumentation/executors/javaagent/build.gradle.kts

+3-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,9 @@ testing {
4444

4545
tasks {
4646
withType<Test>().configureEach {
47-
jvmArgs("-Dotel.instrumentation.executors.include=io.opentelemetry.javaagent.instrumentation.executors.ExecutorInstrumentationTest\$CustomThreadPoolExecutor")
47+
jvmArgs(
48+
"-Dotel.instrumentation.executors.include=io.opentelemetry.javaagent.instrumentation.executors.ExecutorInstrumentationTest\$CustomThreadPoolExecutor"
49+
)
4850
jvmArgs("-Djava.awt.headless=true")
4951
}
5052

‎instrumentation/ktor/ktor-1.0/library/src/main/kotlin/io/opentelemetry/instrumentation/ktor/v1_0/KtorServerTracing.kt

+7-2
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,10 @@ class KtorServerTracing private constructor(
3434

3535
internal val additionalExtractors = mutableListOf<AttributesExtractor<in ApplicationRequest, in ApplicationResponse>>()
3636

37-
internal val httpAttributesExtractorBuilder = HttpServerAttributesExtractor.builder(KtorHttpServerAttributesGetter.INSTANCE, KtorNetServerAttributesGetter())
37+
internal val httpAttributesExtractorBuilder = HttpServerAttributesExtractor.builder(
38+
KtorHttpServerAttributesGetter.INSTANCE,
39+
KtorNetServerAttributesGetter()
40+
)
3841

3942
internal var statusExtractor:
4043
(SpanStatusExtractor<ApplicationRequest, ApplicationResponse>) -> SpanStatusExtractor<in ApplicationRequest, in ApplicationResponse> = { a -> a }
@@ -43,7 +46,9 @@ class KtorServerTracing private constructor(
4346
this.openTelemetry = openTelemetry
4447
}
4548

46-
fun setStatusExtractor(extractor: (SpanStatusExtractor<ApplicationRequest, ApplicationResponse>) -> SpanStatusExtractor<in ApplicationRequest, in ApplicationResponse>) {
49+
fun setStatusExtractor(
50+
extractor: (SpanStatusExtractor<ApplicationRequest, ApplicationResponse>) -> SpanStatusExtractor<in ApplicationRequest, in ApplicationResponse>
51+
) {
4752
this.statusExtractor = extractor
4853
}
4954

‎instrumentation/ktor/ktor-2.0/library/src/main/kotlin/io/opentelemetry/instrumentation/ktor/v2_0/KtorServerTracing.kt

+7-2
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,10 @@ class KtorServerTracing private constructor(
3434

3535
internal val additionalExtractors = mutableListOf<AttributesExtractor<in ApplicationRequest, in ApplicationResponse>>()
3636

37-
internal val httpAttributesExtractorBuilder = HttpServerAttributesExtractor.builder(KtorHttpServerAttributesGetter.INSTANCE, KtorNetServerAttributesGetter())
37+
internal val httpAttributesExtractorBuilder = HttpServerAttributesExtractor.builder(
38+
KtorHttpServerAttributesGetter.INSTANCE,
39+
KtorNetServerAttributesGetter()
40+
)
3841

3942
internal var statusExtractor:
4043
(SpanStatusExtractor<ApplicationRequest, ApplicationResponse>) -> SpanStatusExtractor<in ApplicationRequest, in ApplicationResponse> = { a -> a }
@@ -43,7 +46,9 @@ class KtorServerTracing private constructor(
4346
this.openTelemetry = openTelemetry
4447
}
4548

46-
fun setStatusExtractor(extractor: (SpanStatusExtractor<ApplicationRequest, ApplicationResponse>) -> SpanStatusExtractor<in ApplicationRequest, in ApplicationResponse>) {
49+
fun setStatusExtractor(
50+
extractor: (SpanStatusExtractor<ApplicationRequest, ApplicationResponse>) -> SpanStatusExtractor<in ApplicationRequest, in ApplicationResponse>
51+
) {
4752
this.statusExtractor = extractor
4853
}
4954

‎instrumentation/methods/javaagent/build.gradle.kts

+3-1
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,7 @@ dependencies {
1414
}
1515

1616
tasks.withType<Test>().configureEach {
17-
jvmArgs("-Dotel.instrumentation.methods.include=io.opentelemetry.javaagent.instrumentation.methods.MethodTest\$ConfigTracedCallable[call];io.opentelemetry.javaagent.instrumentation.methods.MethodTest\$ConfigTracedCompletableFuture[getResult]")
17+
jvmArgs(
18+
"-Dotel.instrumentation.methods.include=io.opentelemetry.javaagent.instrumentation.methods.MethodTest\$ConfigTracedCallable[call];io.opentelemetry.javaagent.instrumentation.methods.MethodTest\$ConfigTracedCompletableFuture[getResult]"
19+
)
1820
}

‎smoke-tests/images/servlet/build.gradle.kts

+19-2
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,14 @@ plugins {
88
id("com.bmuschko.docker-remote-api")
99
}
1010

11-
data class ImageTarget(val version: List<String>, val vm: List<String>, val jdk: List<String>, val args: Map<String, String> = emptyMap(), val war: String = "servlet-3.0", val windows: Boolean = true)
11+
data class ImageTarget(
12+
val version: List<String>,
13+
val vm: List<String>,
14+
val jdk: List<String>,
15+
val args: Map<String, String> = emptyMap(),
16+
val war: String = "servlet-3.0",
17+
val windows: Boolean = true
18+
)
1219

1320
val extraTag = findProperty("extraTag")
1421
?: java.time.format.DateTimeFormatter.ofPattern("yyyyMMdd.HHmmSS").format(java.time.LocalDateTime.now())
@@ -112,7 +119,17 @@ tasks {
112119
}
113120
}
114121

115-
fun configureImage(parentTask: TaskProvider<out Task>, server: String, dockerfile: String, version: String, vm: String, jdk: String, warProject: String, args: Map<String, String>, isWindows: Boolean): String {
122+
fun configureImage(
123+
parentTask: TaskProvider<out Task>,
124+
server: String,
125+
dockerfile: String,
126+
version: String,
127+
vm: String,
128+
jdk: String,
129+
warProject: String,
130+
args: Map<String, String>,
131+
isWindows: Boolean
132+
): String {
116133
// Using separate build directory for different image
117134
val dockerWorkingDir = file("$buildDir/docker-$server-$version-jdk$jdk-$vm-$warProject")
118135
val dockerFileName = "$dockerfile.${if (isWindows) "windows." else ""}dockerfile"

0 commit comments

Comments
 (0)