Bump spotless-plugin-gradle from 6.12.1 to 6.13.0

all/build.gradle.kts

@@ -113,4 +113,4 @@ tasks.named<JacocoReport>("jacocoTestReport") {
     // without any external tools
     html.required.set(true)
   }
-}
+}

api/all/build.gradle.kts

@@ -22,4 +22,4 @@ dependencies {
 tasks.test {
   // Configure environment variable for ConfigUtilTest
   environment("CONFIG_KEY", "environment")
-}
+}

api/logs/build.gradle.kts

@@ -10,4 +10,4 @@ otelJava.moduleName.set("io.opentelemetry.api.logs")
 
 dependencies {
   api(project(":api:all"))
-}
+}

build.gradle.kts

@@ -72,4 +72,4 @@ tasks {
       }
     }
   }
-}
+}

buildSrc/build.gradle.kts

@@ -32,7 +32,7 @@ repositories {
 dependencies {
   implementation("com.google.auto.value:auto-value-annotations:1.10.1")
   // When updating, update above in plugins too
-  implementation("com.diffplug.spotless:spotless-plugin-gradle:6.12.1")
+  implementation("com.diffplug.spotless:spotless-plugin-gradle:6.13.0")
   // Needed for japicmp but not automatically brought in for some reason.
   implementation("com.google.guava:guava:31.1-jre")
   implementation("com.squareup:javapoet:1.13.0")

buildSrc/src/main/kotlin/otel.protobuf-conventions.gradle.kts

@@ -1,9 +1,9 @@
 import com.google.protobuf.gradle.*
 
 plugins {
-  id("com.google.protobuf")
-
   id("otel.java-conventions")
+
+  id("com.google.protobuf")
 }
 
 protobuf {

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

@@ -22,7 +22,18 @@ spotless {
   }
   plugins.withId("org.jetbrains.kotlin.jvm") {
     kotlin {
-      ktlint().editorConfigOverride(mapOf("indent_size" to "2", "continuation_indent_size" to "2", "disabled_rules" to "no-wildcard-imports"))
+      ktlint().editorConfigOverride(mapOf(
+        "indent_size" to "2",
+        "continuation_indent_size" to "2",
+        "max_line_length" to "160",
+        "ktlint_standard_no-wildcard-imports" to "disabled",
+        // ktlint does not break up long lines, it just fails on them
+        "ktlint_standard_max-line-length" to "disabled",
+        // ktlint makes it *very* hard to locate where this actually happened
+        "ktlint_standard_trailing-comma-on-call-site" to "disabled",
+        // also very hard to find out where this happens
+        "ktlint_standard_wrapping" to "disabled"
+      ))
       licenseHeaderFile(rootProject.file("buildscripts/spotless.license.java"), "(package|import|class|// Includes work from:)")
     }
   }

context/build.gradle.kts

@@ -71,4 +71,4 @@ tasks {
   check {
     dependsOn(testing.suites)
   }
-}
+}

exporters/common/build.gradle.kts

@@ -36,4 +36,4 @@ dependencies {
   testImplementation("com.google.api.grpc:proto-google-common-protos")
   testImplementation("io.grpc:grpc-testing")
   testRuntimeOnly("io.grpc:grpc-netty-shaded")
-}
+}

exporters/jaeger-proto/build.gradle.kts

@@ -22,4 +22,4 @@ tasks {
       compilerArgs.add("-Xlint:-serial")
     }
   }
-}
+}

exporters/jaeger-thrift/build.gradle.kts

@@ -25,4 +25,4 @@ dependencies {
   testImplementation("com.google.guava:guava-testlib")
 
   testImplementation(project(":sdk:testing"))
-}
+}

exporters/jaeger/build.gradle.kts

@@ -46,4 +46,4 @@ sourceSets {
   main {
     java.srcDir("$buildDir/generated/source/wire")
   }
-}
+}

exporters/logging-otlp/build.gradle.kts

@@ -25,4 +25,4 @@ dependencies {
   testImplementation(project(":sdk:trace"))
 
   testImplementation("org.skyscreamer:jsonassert")
-}
+}

exporters/logging/build.gradle.kts

@@ -17,4 +17,4 @@ dependencies {
 
   testImplementation(project(":sdk:testing"))
   testImplementation(project(":sdk:logs-testing"))
-}
+}

exporters/otlp/all/build.gradle.kts

@@ -80,4 +80,4 @@ tasks {
       },
     )
   }
-}
+}

exporters/otlp/common/build.gradle.kts

@@ -57,4 +57,4 @@ sourceSets {
   main {
     java.srcDir("$buildDir/generated/source/wire")
   }
-}
+}

exporters/otlp/logs/build.gradle.kts

@@ -62,4 +62,4 @@ tasks {
   named("check") {
     dependsOn(testing.suites)
   }
-}
+}

exporters/otlp/testing-internal/build.gradle.kts

@@ -30,4 +30,4 @@ dependencies {
   implementation("com.linecorp.armeria:armeria-junit5")
   implementation("io.github.netmikey.logunit:logunit-jul")
   implementation("org.assertj:assertj-core")
-}
+}

exporters/prometheus/build.gradle.kts

@@ -90,4 +90,4 @@ tasks {
       compilerArgs.add("--add-reads=io.opentelemetry.exporters.prometheus.test=org.junit.jupiter.api")
     }
   }
-}
+}

exporters/zipkin/build.gradle.kts

@@ -23,4 +23,4 @@ dependencies {
 
   testImplementation("com.linecorp.armeria:armeria")
   testImplementation("org.testcontainers:junit-jupiter")
-}
+}

extensions/incubator/build.gradle.kts

@@ -13,4 +13,4 @@ dependencies {
   api(project(":api:all"))
 
   testImplementation(project(":sdk:testing"))
-}
+}

extensions/kotlin/build.gradle.kts

@@ -59,4 +59,4 @@ tasks {
   check {
     dependsOn(testing.suites)
   }
-}
+}

extensions/kotlin/src/main/kotlin/io/opentelemetry/extension/kotlin/ContextExtensions.kt

@@ -34,4 +34,4 @@ fun CoroutineContext.getOpenTelemetryContext(): Context {
     return element.context
   }
   return Context.root()
-}
+}

extensions/kotlin/src/test/kotlin/io/opentelemetry/extension/kotlin/KotlinCoroutinesTest.kt

@@ -101,4 +101,4 @@ class KotlinCoroutinesTest {
       }
     }
   }
-}
+}

extensions/kotlin/src/testStrictContext/kotlin/io/opentelemetry/extension/kotlin/StrictContextWithCoroutinesTest.kt

@@ -149,4 +149,4 @@ class StrictContextWithCoroutinesTest {
       assertThat(Context.current().get(ANIMAL)).isEqualTo(animal)
     }
   }
-}
+}

extensions/trace-propagators/build.gradle.kts

@@ -16,4 +16,4 @@ dependencies {
 
   testImplementation("io.jaegertracing:jaeger-client")
   testImplementation("com.google.guava:guava")
-}
+}

integration-tests/build.gradle.kts

@@ -13,4 +13,4 @@ dependencies {
   testImplementation("com.linecorp.armeria:armeria-junit5")
   testImplementation("org.junit.jupiter:junit-jupiter-params")
   testImplementation("org.testcontainers:junit-jupiter")
-}
+}

integration-tests/graal/build.gradle.kts

@@ -26,4 +26,4 @@ graalvmNative {
     }
   }
   toolchainDetection.set(false)
-}
+}

integration-tests/otlp/build.gradle.kts

@@ -40,4 +40,4 @@ tasks {
   check {
     dependsOn(testing.suites)
   }
-}
+}

integration-tests/tracecontext/build.gradle.kts

@@ -30,4 +30,4 @@ tasks {
 
     jvmArgs("-Dio.opentelemetry.testArchive=${shadowJar.get().archiveFile.get().asFile.absolutePath}")
   }
-}
+}

opencensus-shim/build.gradle.kts

@@ -28,4 +28,4 @@ tasks.named<Test>("test") {
   // methods available.
   setForkEvery(1)
   maxParallelForks = 3
-}
+}

opentracing-shim/build.gradle.kts

@@ -24,4 +24,4 @@ tasks {
       showStandardStreams = true
     }
   }
-}
+}

perf-harness/build.gradle.kts

@@ -17,4 +17,4 @@ dependencies {
   implementation("org.testcontainers:junit-jupiter")
 
   runtimeOnly("io.grpc:grpc-netty-shaded")
-}
+}

sdk-extensions/autoconfigure-spi/build.gradle.kts

@@ -15,4 +15,4 @@ dependencies {
   // implementation dependency to require users to add the artifact directly to their build to use
   // SdkLoggerProviderBuilder.
   implementation(project(":sdk:logs"))
-}
+}

sdk-extensions/autoconfigure/build.gradle.kts

@@ -114,4 +114,4 @@ tasks {
   check {
     dependsOn(testing.suites)
   }
-}
+}

sdk-extensions/incubator/build.gradle.kts

@@ -30,4 +30,4 @@ dependencies {
   testImplementation(project(":sdk-extensions:autoconfigure"))
 
   testImplementation("com.google.guava:guava-testlib")
-}
+}

sdk-extensions/jaeger-remote-sampler/build.gradle.kts

@@ -49,6 +49,14 @@ testing {
   }
 }
 
+afterEvaluate {
+  // Classpath when compiling testGrpcNetty, we add dependency management directly
+  // since it doesn't follow Gradle conventions of naming / properties.
+  dependencies {
+    add("testGrpcNettyCompileProtoPath", platform(project(":dependencyManagement")))
+  }
+}
+
 tasks {
   check {
     dependsOn(testing.suites)
@@ -74,4 +82,4 @@ tasks {
       compilerArgs.add("-Xlint:-serial")
     }
   }
-}
+}

sdk/all/build.gradle.kts

@@ -25,4 +25,4 @@ dependencies {
   testAnnotationProcessor("com.google.auto.value:auto-value")
 
   testImplementation(project(":sdk:testing"))
-}
+}

sdk/common/build.gradle.kts

@@ -79,4 +79,4 @@ tasks {
   check {
     dependsOn(testing.suites)
   }
-}
+}

sdk/logs-testing/build.gradle.kts

@@ -21,4 +21,4 @@ dependencies {
   testImplementation(project(":sdk:logs-testing"))
 
   testImplementation("junit:junit")
-}
+}

sdk/logs/build.gradle.kts

@@ -18,4 +18,4 @@ dependencies {
   testImplementation("org.awaitility:awaitility")
 
   annotationProcessor("com.google.auto.value:auto-value")
-}
+}

sdk/metrics-testing/build.gradle.kts

@@ -18,4 +18,4 @@ dependencies {
   annotationProcessor("com.google.auto.value:auto-value")
 
   testImplementation("junit:junit")
-}
+}

sdk/metrics/build.gradle.kts

@@ -54,4 +54,4 @@ tasks {
   check {
     dependsOn(testing.suites)
   }
-}
+}

sdk/testing/build.gradle.kts

@@ -20,4 +20,4 @@ dependencies {
 
   testImplementation("junit:junit")
   testImplementation("org.junit.vintage:junit-vintage-engine")
-}
+}

sdk/trace-shaded-deps/build.gradle.kts

@@ -30,4 +30,4 @@ tasks {
 tasks.withType<Test>().configureEach {
   // JcToolsSecurityManagerTest interferes with JcToolsTest
   setForkEvery(1)
-}
+}

sdk/trace/build.gradle.kts

@@ -65,4 +65,4 @@ tasks {
     exclude("**/internal/shaded/jctools/**")
     exclude("**/internal/JcTools*")
   }
-}
+}

semconv/build.gradle.kts

@@ -10,4 +10,4 @@ otelJava.moduleName.set("io.opentelemetry.semconv")
 
 dependencies {
   api(project(":api:all"))
-}
+}

settings.gradle.kts

@@ -77,4 +77,4 @@ gradleEnterprise {
       tag("CI")
     }
   }
-}
+}

testing-internal/build.gradle.kts

@@ -8,4 +8,4 @@ otelJava.moduleName.set("io.opentelemetry.internal.testing")
 dependencies {
   api("org.junit.jupiter:junit-jupiter-api")
   implementation("org.slf4j:jul-to-slf4j")
-}
+}

version.gradle.kts

@@ -10,4 +10,4 @@ allprojects {
     ver += "-SNAPSHOT"
   }
   version = ver
-}
+}