Format kotlin gradle files (#3942)

* Add ktlint for kotlinGradle

* ktlint fails on wildcard imports

* Auto-format kotlin gradle files

benchmark/build.gradle.kts

@@ -64,4 +64,3 @@ sed '/unknown/d' benchmark/build/reports/jmh/profiler.txt | sed '/^thread_start/
 (using https://github.com/brendangregg/FlameGraph)
 ./flamegraph.pl --color=java benchmark/build/reports/jmh/profiler-cleaned.txt > benchmark/build/reports/jmh/jmh-main.svg
  */
-

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

@@ -17,10 +17,12 @@ spotless {
     target("src/**/*.scala")
   }
   kotlin {
-    // ktfmt() // only supports 4 space indentation
     ktlint().userData(mapOf("indent_size" to "2", "continuation_indent_size" to "2"))
     licenseHeaderFile(rootProject.file("gradle/enforcement/spotless.license.java"), "(package|import|public)")
   }
+  kotlinGradle {
+    ktlint().userData(mapOf("indent_size" to "2", "continuation_indent_size" to "2"))
+  }
   format("misc") {
     // not using "**/..." to help keep spotless fast
     target(".gitignore", "*.md", "src/**/*.md", "*.sh", "src/**/*.properties")

instrumentation-api/build.gradle.kts

@@ -11,7 +11,7 @@ sourceSets {
     java {
       // gradle-jflex-plugin has a bug in that it always looks for the last srcDir in this source
       // set to generate into. By default it would be the src/main directory itself.
-      srcDir("${buildDir}/generated/sources/jflex")
+      srcDir("$buildDir/generated/sources/jflex")
     }
 
     val cachingShadedDeps = project(":instrumentation-api-caching")

instrumentation/akka-http-10.0/javaagent/build.gradle.kts

@@ -32,7 +32,7 @@ muzzle {
     // later versions of akka-http expect streams to be provided
     extraDependency("com.typesafe.akka:akka-stream_2.12:2.5.11")
   }
-  //There is no akka-http 10.0.x series for scala 2.13
+  // There is no akka-http 10.0.x series for scala 2.13
   pass {
     group.set("com.typesafe.akka")
     module.set("akka-http_2.13")

instrumentation/apache-dubbo-2.7/library/build.gradle.kts

@@ -10,4 +10,4 @@ dependencies {
   testLibrary("org.apache.dubbo:dubbo-config-api:2.7.0")
   latestDepTestLibrary("org.apache.dubbo:dubbo:2.+")
   latestDepTestLibrary("org.apache.dubbo:dubbo-config-api:2.+")
-}
+}

instrumentation/apache-dubbo-2.7/testing/build.gradle.kts

@@ -7,8 +7,8 @@ val apacheDubboVersion = "2.7.5"
 dependencies {
   api(project(":testing-common"))
 
-  api("org.apache.dubbo:dubbo:${apacheDubboVersion}")
-  api("org.apache.dubbo:dubbo-config-api:${apacheDubboVersion}")
+  api("org.apache.dubbo:dubbo:$apacheDubboVersion")
+  api("org.apache.dubbo:dubbo-config-api:$apacheDubboVersion")
 
   implementation("javax.annotation:javax.annotation-api:1.3.2")
   implementation("com.google.guava:guava")

instrumentation/async-http-client/async-http-client-2.0/javaagent/build.gradle.kts

@@ -21,7 +21,7 @@ dependencies {
 }
 
 otelJava {
-  //AHC uses Unsafe and so does not run on later java version
+  // AHC uses Unsafe and so does not run on later java version
   maxJavaVersionForTests.set(JavaVersion.VERSION_1_8)
 }
 
@@ -32,7 +32,7 @@ if (!(findProperty("testLatestDeps") as Boolean)) {
     if (!name.contains("muzzle")) {
       resolutionStrategy {
         eachDependency {
-          //specifying a fixed version for all libraries with io.netty' group
+          // specifying a fixed version for all libraries with io.netty' group
           if (requested.group == "io.netty" && requested.name != "netty-bom") {
             useVersion("4.0.34.Final")
           }

instrumentation/aws-sdk/aws-sdk-1.11/javaagent/build.gradle.kts

@@ -97,7 +97,6 @@ tasks {
 
   val testSqs by existing
 
-
   if (!(findProperty("testLatestDeps") as Boolean)) {
     named("check") {
       dependsOn(test_before_1_11_106)

instrumentation/cassandra/cassandra-3.0/javaagent/build.gradle.kts

@@ -44,4 +44,4 @@ tasks {
   named<Test>("test") {
     usesService(gradle.sharedServices.registrations["testcontainersBuildService"].getService())
   }
-}
+}

instrumentation/cassandra/cassandra-4.0/javaagent/build.gradle.kts

@@ -24,4 +24,4 @@ tasks {
   named<Test>("test") {
     usesService(gradle.sharedServices.registrations["testcontainersBuildService"].getService())
   }
-}
+}

instrumentation/couchbase/couchbase-3.1.6/javaagent/build.gradle.kts

@@ -32,4 +32,4 @@ tasks {
   named<Test>("test") {
     usesService(gradle.sharedServices.registrations["testcontainersBuildService"].getService())
   }
-}
+}

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

@@ -22,4 +22,4 @@ tasks {
   assemble {
     dependsOn(shadowJar)
   }
-}
+}

instrumentation/couchbase/couchbase-3.1/javaagent/build.gradle.kts

@@ -32,4 +32,4 @@ tasks {
   named<Test>("test") {
     usesService(gradle.sharedServices.registrations["testcontainersBuildService"].getService())
   }
-}
+}

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

@@ -22,4 +22,4 @@ tasks {
   assemble {
     dependsOn(shadowJar)
   }
-}
+}

instrumentation/couchbase/couchbase-3.2/javaagent/build.gradle.kts

@@ -29,4 +29,4 @@ tasks {
   named<Test>("test") {
     usesService(gradle.sharedServices.registrations["testcontainersBuildService"].getService())
   }
-}
+}

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

@@ -22,4 +22,4 @@ tasks {
   assemble {
     dependsOn(shadowJar)
   }
-}
+}

instrumentation/couchbase/couchbase-testing/build.gradle.kts

@@ -13,4 +13,4 @@ dependencies {
   implementation("org.codehaus.groovy:groovy-all")
   implementation("io.opentelemetry:opentelemetry-api")
   implementation("org.spockframework:spock-core")
-}
+}

instrumentation/elasticsearch/elasticsearch-rest-6.4/javaagent/build.gradle.kts

@@ -26,9 +26,9 @@ dependencies {
 
   testInstrumentation(project(":instrumentation:apache-httpclient:apache-httpclient-4.0:javaagent"))
   testInstrumentation(project(":instrumentation:apache-httpasyncclient-4.1:javaagent"))
-  //TODO: review the following claim, we are not using embedded ES anymore
+  // TODO: review the following claim, we are not using embedded ES anymore
   // Netty is used, but it adds complexity to the tests since we're using embedded ES.
-  //testInstrumentation(project(":instrumentation:netty:netty-4.1:javaagent"))
+  // testInstrumentation(project(":instrumentation:netty:netty-4.1:javaagent"))
 
   testImplementation("org.apache.logging.log4j:log4j-core:2.11.0")
   testImplementation("org.apache.logging.log4j:log4j-api:2.11.0")
@@ -43,4 +43,4 @@ tasks {
   named<Test>("test") {
     usesService(gradle.sharedServices.registrations["testcontainersBuildService"].getService())
   }
-}
+}

instrumentation/elasticsearch/elasticsearch-rest-7.0/javaagent/build.gradle.kts

@@ -26,9 +26,9 @@ dependencies {
 
   testInstrumentation(project(":instrumentation:apache-httpclient:apache-httpclient-4.0:javaagent"))
   testInstrumentation(project(":instrumentation:apache-httpasyncclient-4.1:javaagent"))
-  //TODO: review the following claim, we are not using embedded ES anymore
+  // TODO: review the following claim, we are not using embedded ES anymore
   // Netty is used, but it adds complexity to the tests since we're using embedded ES.
-  //testInstrumentation(project(":instrumentation:netty:netty-4.1:javaagent"))
+  // testInstrumentation(project(":instrumentation:netty:netty-4.1:javaagent"))
 
   testImplementation("org.apache.logging.log4j:log4j-core:2.11.0")
   testImplementation("org.apache.logging.log4j:log4j-api:2.11.0")
@@ -40,4 +40,4 @@ tasks {
   named<Test>("test") {
     usesService(gradle.sharedServices.registrations["testcontainersBuildService"].getService())
   }
-}
+}

instrumentation/elasticsearch/elasticsearch-transport-common/library/build.gradle.kts

@@ -2,4 +2,4 @@ plugins {
   id("otel.library-instrumentation")
 }
 
-// No dependencies, elasticsearch library not actually used here.
+// No dependencies, elasticsearch library not actually used here.

instrumentation/elasticsearch/elasticsearch-transport-testing/build.gradle.kts

@@ -7,4 +7,4 @@ dependencies {
   compileOnly("org.elasticsearch:elasticsearch:5.3.0")
 
   implementation(project(":testing-common"))
-}
+}

instrumentation/external-annotations/javaagent/build.gradle.kts

@@ -16,7 +16,7 @@ dependencies {
     isTransitive = false
   }
   testImplementation("com.signalfx.public:signalfx-trace-api:0.48.0-sfx1")
-  //Old and new versions of kamon use different packages for Trace annotation
+  // Old and new versions of kamon use different packages for Trace annotation
   testImplementation("io.kamon:kamon-annotation_2.11:0.6.7") {
     isTransitive = false
   }

instrumentation/grails-3.0/javaagent/build.gradle.kts

@@ -45,4 +45,4 @@ dependencies {
   latestDepTestLibrary("org.grails:grails-plugin-url-mappings:4.0.+")
   latestDepTestLibrary("org.springframework.boot:spring-boot-autoconfigure:2.1.17.RELEASE")
   latestDepTestLibrary("org.springframework.boot:spring-boot-starter-tomcat:2.1.17.RELEASE")
-}
+}

instrumentation/grpc-1.6/javaagent/build.gradle.kts

@@ -16,14 +16,14 @@ val grpcVersion = "1.6.0"
 dependencies {
   implementation(project(":instrumentation:grpc-1.6:library"))
 
-  library("io.grpc:grpc-core:${grpcVersion}")
+  library("io.grpc:grpc-core:$grpcVersion")
 
   testInstrumentation(project(":instrumentation:netty:netty-4.1:javaagent"))
 
-  testLibrary("io.grpc:grpc-netty:${grpcVersion}")
-  testLibrary("io.grpc:grpc-protobuf:${grpcVersion}")
-  testLibrary("io.grpc:grpc-services:${grpcVersion}")
-  testLibrary("io.grpc:grpc-stub:${grpcVersion}")
+  testLibrary("io.grpc:grpc-netty:$grpcVersion")
+  testLibrary("io.grpc:grpc-protobuf:$grpcVersion")
+  testLibrary("io.grpc:grpc-services:$grpcVersion")
+  testLibrary("io.grpc:grpc-stub:$grpcVersion")
 
   testImplementation(project(":instrumentation:grpc-1.6:testing"))
 }

instrumentation/grpc-1.6/library/build.gradle.kts

@@ -5,12 +5,12 @@ plugins {
 val grpcVersion = "1.6.0"
 
 dependencies {
-  library("io.grpc:grpc-core:${grpcVersion}")
+  library("io.grpc:grpc-core:$grpcVersion")
 
-  testLibrary("io.grpc:grpc-netty:${grpcVersion}")
-  testLibrary("io.grpc:grpc-protobuf:${grpcVersion}")
-  testLibrary("io.grpc:grpc-services:${grpcVersion}")
-  testLibrary("io.grpc:grpc-stub:${grpcVersion}")
+  testLibrary("io.grpc:grpc-netty:$grpcVersion")
+  testLibrary("io.grpc:grpc-protobuf:$grpcVersion")
+  testLibrary("io.grpc:grpc-services:$grpcVersion")
+  testLibrary("io.grpc:grpc-stub:$grpcVersion")
 
   testImplementation("org.assertj:assertj-core")
   testImplementation(project(":instrumentation:grpc-1.6:testing"))

instrumentation/grpc-1.6/testing/build.gradle.kts

@@ -1,4 +1,8 @@
-import com.google.protobuf.gradle.*
+import com.google.protobuf.gradle.generateProtoTasks
+import com.google.protobuf.gradle.id
+import com.google.protobuf.gradle.plugins
+import com.google.protobuf.gradle.protobuf
+import com.google.protobuf.gradle.protoc
 
 plugins {
   id("otel.java-conventions")
@@ -14,7 +18,7 @@ protobuf {
   }
   plugins {
     id("grpc") {
-      artifact = "io.grpc:protoc-gen-grpc-java:${grpcVersion}"
+      artifact = "io.grpc:protoc-gen-grpc-java:$grpcVersion"
     }
   }
   generateProtoTasks {
@@ -29,10 +33,10 @@ protobuf {
 dependencies {
   api(project(":testing-common"))
 
-  api("io.grpc:grpc-core:${grpcVersion}")
-  api("io.grpc:grpc-protobuf:${grpcVersion}")
-  api("io.grpc:grpc-services:${grpcVersion}")
-  api("io.grpc:grpc-stub:${grpcVersion}")
+  api("io.grpc:grpc-core:$grpcVersion")
+  api("io.grpc:grpc-protobuf:$grpcVersion")
+  api("io.grpc:grpc-services:$grpcVersion")
+  api("io.grpc:grpc-stub:$grpcVersion")
 
   implementation("javax.annotation:javax.annotation-api:1.3.2")
 

instrumentation/guava-10.0/library/build.gradle.kts

@@ -5,4 +5,4 @@ plugins {
 dependencies {
   library("com.google.guava:guava:10.0")
   implementation(project(":instrumentation-api-annotation-support"))
-}
+}

instrumentation/gwt-2.0/javaagent/build.gradle.kts

@@ -14,7 +14,7 @@ muzzle {
 sourceSets {
   create("testapp") {
     java {
-      destinationDirectory.set(file("${buildDir}/testapp/classes"))
+      destinationDirectory.set(file("$buildDir/testapp/classes"))
     }
     resources {
       srcDirs("src/webapp")

instrumentation/hibernate/hibernate-4.0/javaagent/build.gradle.kts

@@ -48,7 +48,7 @@ dependencies {
   testImplementation("com.sun.xml.bind:jaxb-impl:2.2.11")
   testImplementation("javax.activation:activation:1.1.1")
   testImplementation("org.hsqldb:hsqldb:2.0.0")
-  //First version to work with Java 14
+  // First version to work with Java 14
   testImplementation("org.springframework.data:spring-data-jpa:1.8.0.RELEASE")
 
   testImplementation("org.hibernate:hibernate-core:4.0.0.Final")

instrumentation/internal/internal-class-loader/javaagent/build.gradle.kts

@@ -17,7 +17,7 @@ dependencies {
   // TODO: we should separate core and Eclipse tests at some point,
   // but right now core-specific tests are quite dumb and are run with
   // core version provided by Eclipse implementation.
-  //testImplementation("org.osgi:org.osgi.core:4.0.0")
+  // testImplementation("org.osgi:org.osgi.core:4.0.0")
   testImplementation("org.eclipse.platform:org.eclipse.osgi:3.13.200")
   testImplementation("org.apache.felix:org.apache.felix.framework:6.0.2")
 }

instrumentation/java-http-client/javaagent/build.gradle.kts

@@ -10,4 +10,4 @@ muzzle {
 
 otelJava {
   minJavaVersionSupported.set(JavaVersion.VERSION_11)
-}
+}

instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-arquillian-testing/build.gradle.kts

@@ -9,8 +9,8 @@ dependencies {
   implementation("io.opentelemetry:opentelemetry-api")
 
   val arquillianVersion = "1.4.0.Final"
-  implementation("org.jboss.arquillian.junit:arquillian-junit-container:${arquillianVersion}")
-  implementation("org.jboss.arquillian.protocol:arquillian-protocol-servlet:${arquillianVersion}")
+  implementation("org.jboss.arquillian.junit:arquillian-junit-container:$arquillianVersion")
+  implementation("org.jboss.arquillian.protocol:arquillian-protocol-servlet:$arquillianVersion")
   implementation("org.jboss.arquillian.spock:arquillian-spock-container:1.0.0.CR1")
   api("org.jboss.shrinkwrap:shrinkwrap-impl-base:1.2.6")
 }

instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-resteasy-common/javaagent/build.gradle.kts

@@ -9,4 +9,4 @@ dependencies {
   compileOnly("org.jboss.resteasy:resteasy-jaxrs:3.1.0.Final")
 
   implementation(project(":instrumentation:jaxrs:jaxrs-2.0:jaxrs-2.0-common:javaagent"))
-}
+}

instrumentation/jaxws/jaxws-2.0-arquillian-testing/build.gradle.kts

@@ -10,8 +10,8 @@ dependencies {
   implementation("org.jsoup:jsoup:1.13.1")
 
   val arquillianVersion = "1.4.0.Final"
-  implementation("org.jboss.arquillian.junit:arquillian-junit-container:${arquillianVersion}")
-  implementation("org.jboss.arquillian.protocol:arquillian-protocol-servlet:${arquillianVersion}")
+  implementation("org.jboss.arquillian.junit:arquillian-junit-container:$arquillianVersion")
+  implementation("org.jboss.arquillian.protocol:arquillian-protocol-servlet:$arquillianVersion")
   implementation("org.jboss.arquillian.spock:arquillian-spock-container:1.0.0.CR1")
   api("org.jboss.shrinkwrap:shrinkwrap-impl-base:1.2.6")
 }

instrumentation/jaxws/jaxws-2.0-axis2-1.6/javaagent/build.gradle.kts

@@ -27,9 +27,9 @@ dependencies {
   implementation(project(":instrumentation:jaxws:jaxws-2.0-axis2-1.6:library"))
 
   val axis2Version = "1.6.0"
-  library("org.apache.axis2:axis2-jaxws:${axis2Version}")
-  testLibrary("org.apache.axis2:axis2-transport-http:${axis2Version}")
-  testLibrary("org.apache.axis2:axis2-transport-local:${axis2Version}")
+  library("org.apache.axis2:axis2-jaxws:$axis2Version")
+  testLibrary("org.apache.axis2:axis2-transport-http:$axis2Version")
+  testLibrary("org.apache.axis2:axis2-transport-local:$axis2Version")
 
   testImplementation(project(":instrumentation:jaxws:jaxws-2.0-testing"))
 
@@ -45,4 +45,4 @@ dependencies {
 
   testImplementation("com.sun.xml.ws:jaxws-rt:2.2.8")
   testImplementation("com.sun.xml.ws:jaxws-tools:2.2.8")
-}
+}

instrumentation/jaxws/jaxws-2.0-cxf-3.0/javaagent/build.gradle.kts

@@ -33,4 +33,4 @@ dependencies {
   testImplementation("javax.activation:javax.activation-api:1.2.0")
   testImplementation("javax.annotation:javax.annotation-api:1.2")
   testImplementation("com.sun.xml.messaging.saaj:saaj-impl:1.5.2")
-}
+}

instrumentation/jaxws/jaxws-2.0-testing/build.gradle.kts

@@ -22,4 +22,4 @@ dependencies {
   api("org.springframework.ws:spring-ws-core:3.0.0.RELEASE")
 
   implementation(project(":testing-common"))
-}
+}

instrumentation/jaxws/jaxws-2.0/javaagent/build.gradle.kts

@@ -13,4 +13,4 @@ muzzle {
 dependencies {
   library("javax.xml.ws:jaxws-api:2.0")
   implementation(project(":instrumentation:jaxws:jaxws-common:library"))
-}
+}

instrumentation/jaxws/jaxws-jws-api-1.1/javaagent/build.gradle.kts

@@ -13,4 +13,4 @@ muzzle {
 dependencies {
   library("javax.jws:javax.jws-api:1.1")
   implementation(project(":instrumentation:jaxws:jaxws-common:library"))
-}
+}

instrumentation/jedis/jedis-1.4/javaagent/build.gradle.kts

@@ -25,4 +25,4 @@ tasks {
   named<Test>("test") {
     usesService(gradle.sharedServices.registrations["testcontainersBuildService"].getService())
   }
-}
+}

instrumentation/jedis/jedis-3.0/javaagent/build.gradle.kts

@@ -35,4 +35,4 @@ tasks {
   named<Test>("test") {
     usesService(gradle.sharedServices.registrations["testcontainersBuildService"].getService())
   }
-}
+}

instrumentation/jetty-httpclient/jetty-httpclient-9.2/javaagent/build.gradle.kts

@@ -10,15 +10,13 @@ muzzle {
   }
 }
 
-
-//Jetty client 9.2 is the best starting point, HttpClient.send() is stable there
+// Jetty client 9.2 is the best starting point, HttpClient.send() is stable there
 val jettyVers_base9 = "9.2.0.v20140526"
 
-
 dependencies {
   implementation(project(":instrumentation:jetty-httpclient:jetty-httpclient-9.2:library"))
 
-  library("org.eclipse.jetty:jetty-client:${jettyVers_base9}")
+  library("org.eclipse.jetty:jetty-client:$jettyVers_base9")
   latestDepTestLibrary("org.eclipse.jetty:jetty-client:9.+")
 
   testImplementation(project(":instrumentation:jetty-httpclient:jetty-httpclient-9.2:testing"))

instrumentation/jetty-httpclient/jetty-httpclient-9.2/library/build.gradle.kts

@@ -2,15 +2,13 @@ plugins {
   id("otel.library-instrumentation")
 }
 
-
-//Jetty client 9.2 is the best starting point, HttpClient.send() is stable there
+// Jetty client 9.2 is the best starting point, HttpClient.send() is stable there
 val jettyVers_base9 = "9.2.0.v20140526"
 
 dependencies {
-  library("org.eclipse.jetty:jetty-client:${jettyVers_base9}")
+  library("org.eclipse.jetty:jetty-client:$jettyVers_base9")
   latestDepTestLibrary("org.eclipse.jetty:jetty-client:9.+")
   testImplementation(project(":instrumentation:jetty-httpclient::jetty-httpclient-9.2:testing"))
 
   implementation("org.slf4j:slf4j-api")
 }
-

instrumentation/jetty-httpclient/jetty-httpclient-9.2/testing/build.gradle.kts

@@ -2,14 +2,13 @@ plugins {
   id("otel.java-conventions")
 }
 
-//Jetty client 9.2 is the best starting point, HttpClient.send() is stable there
+// Jetty client 9.2 is the best starting point, HttpClient.send() is stable there
 val jettyVers_base9 = "9.2.0.v20140526"
 
 dependencies {
   api(project(":testing-common"))
 
-
-  api("org.eclipse.jetty:jetty-client:${jettyVers_base9}")
+  api("org.eclipse.jetty:jetty-client:$jettyVers_base9")
 
   implementation("org.junit.jupiter:junit-jupiter-api")
 

instrumentation/jsf/jsf-testing-common/build.gradle.kts

@@ -15,8 +15,8 @@ dependencies {
   implementation("org.jsoup:jsoup:1.13.1")
 
   val jettyVersion = "9.4.35.v20201120"
-  api("org.eclipse.jetty:jetty-annotations:${jettyVersion}")
-  implementation("org.eclipse.jetty:apache-jsp:${jettyVersion}")
+  api("org.eclipse.jetty:jetty-annotations:$jettyVersion")
+  implementation("org.eclipse.jetty:apache-jsp:$jettyVersion")
   implementation("org.glassfish:jakarta.el:3.0.2")
   implementation("jakarta.websocket:jakarta.websocket-api:1.1.1")
 }

instrumentation/kafka-streams-0.11/javaagent/build.gradle.kts

@@ -52,4 +52,4 @@ tasks {
 // Requires old version of AssertJ for baseline
 if (!(findProperty("testLatestDeps") as Boolean)) {
   configurations.testRuntimeClasspath.resolutionStrategy.force("org.assertj:assertj-core:2.9.1")
-}
+}

instrumentation/kotlinx-coroutines/javaagent/build.gradle.kts

@@ -30,8 +30,8 @@ tasks {
   val compileTestKotlin by existing(AbstractCompile::class)
 
   named<GroovyCompile>("compileTestGroovy") {
-    //Note: look like it should be `classpath += files(sourceSets.test.kotlin.classesDirectory)`
-    //instead, but kotlin plugin doesn't support it (yet?)
+    // Note: look like it should be `classpath += files(sourceSets.test.kotlin.classesDirectory)`
+    // instead, but kotlin plugin doesn't support it (yet?)
     classpath = classpath.plus(files(compileTestKotlin.get().destinationDir))
   }
 }

instrumentation/lettuce/lettuce-4.0/javaagent/build.gradle.kts

@@ -11,7 +11,6 @@ muzzle {
   }
 }
 
-
 dependencies {
   library("biz.paluch.redis:lettuce:4.0.Final")
 

instrumentation/log4j/log4j-1.2/javaagent/build.gradle.kts

@@ -29,4 +29,4 @@ configurations {
   testImplementation {
     exclude("javax.jms", "jms")
   }
-}
+}

instrumentation/mongo/mongo-3.1/javaagent/build.gradle.kts

@@ -23,4 +23,4 @@ tasks {
   named<Test>("test") {
     usesService(gradle.sharedServices.registrations["testcontainersBuildService"].getService())
   }
-}
+}

instrumentation/mongo/mongo-3.1/library/build.gradle.kts

@@ -13,4 +13,4 @@ tasks {
   named<Test>("test") {
     usesService(gradle.sharedServices.registrations["testcontainersBuildService"].getService())
   }
-}
+}

instrumentation/mongo/mongo-3.7/javaagent/build.gradle.kts

@@ -33,4 +33,4 @@ tasks {
   named<Test>("test") {
     usesService(gradle.sharedServices.registrations["testcontainersBuildService"].getService())
   }
-}
+}

instrumentation/mongo/mongo-async-3.3/javaagent/build.gradle.kts

@@ -26,4 +26,4 @@ tasks {
   named<Test>("test") {
     usesService(gradle.sharedServices.registrations["testcontainersBuildService"].getService())
   }
-}
+}

instrumentation/netty/netty-3.8/javaagent/build.gradle.kts

@@ -33,7 +33,7 @@ if (!(findProperty("testLatestDeps") as Boolean)) {
     if (!name.contains("muzzle")) {
       resolutionStrategy {
         eachDependency {
-          //specifying a fixed version for all libraries with io.netty' group
+          // specifying a fixed version for all libraries with io.netty' group
           if (requested.group == "io.netty") {
             useVersion("3.8.0.Final")
           }
@@ -41,4 +41,4 @@ if (!(findProperty("testLatestDeps") as Boolean)) {
       }
     }
   }
-}
+}

instrumentation/netty/netty-4.0/javaagent/build.gradle.kts

@@ -54,7 +54,7 @@ if (!(findProperty("testLatestDeps") as Boolean)) {
     if (!name.contains("muzzle")) {
       resolutionStrategy {
         eachDependency {
-          //specifying a fixed version for all libraries with io.netty' group
+          // specifying a fixed version for all libraries with io.netty' group
           if (requested.group == "io.netty" && requested.name != "netty-bom") {
             useVersion("4.0.0.Final")
           }

instrumentation/netty/netty-4.1/javaagent/build.gradle.kts

@@ -28,7 +28,7 @@ dependencies {
   api(project(":instrumentation:netty:netty-4.1:library"))
   implementation(project(":instrumentation:netty:netty-4-common:javaagent"))
 
-  //Contains logging handler
+  // Contains logging handler
   testLibrary("io.netty:netty-handler:4.1.0.Final")
   testLibrary("io.netty:netty-transport-native-epoll:4.1.0.Final:linux-x86_64")
 
@@ -75,4 +75,4 @@ if (!(findProperty("testLatestDeps") as Boolean)) {
       }
     }
   }
-}
+}

instrumentation/netty/netty-4.1/library/build.gradle.kts

@@ -4,4 +4,4 @@ plugins {
 
 dependencies {
   compileOnly("io.netty:netty-codec-http:4.1.0.Final")
-}
+}

instrumentation/oshi/library/build.gradle.kts

@@ -2,7 +2,6 @@ plugins {
   id("otel.library-instrumentation")
 }
 
-
 dependencies {
   implementation("io.opentelemetry:opentelemetry-api-metrics")
 
@@ -11,4 +10,4 @@ dependencies {
   testImplementation("io.opentelemetry:opentelemetry-sdk-metrics")
   testImplementation(project(":testing-common"))
   testImplementation("org.assertj:assertj-core")
-}
+}

instrumentation/play-ws/play-ws-testing/build.gradle.kts

@@ -6,9 +6,9 @@ val scalaVersion = "2.12"
 
 dependencies {
   api(project(":testing-common"))
-  api("com.typesafe.play:play-ahc-ws-standalone_${scalaVersion}:1.0.2")
+  api("com.typesafe.play:play-ahc-ws-standalone_$scalaVersion:1.0.2")
 
   implementation("org.codehaus.groovy:groovy-all")
   implementation("io.opentelemetry:opentelemetry-api")
   implementation("org.spockframework:spock-core")
-}
+}

instrumentation/play/play-2.4/javaagent/build.gradle.kts

@@ -59,7 +59,7 @@ if (!(findProperty("testLatestDeps") as Boolean)) {
   configurations.configureEach {
     resolutionStrategy {
       eachDependency {
-        //specifying a fixed version for all libraries with io.netty' group
+        // specifying a fixed version for all libraries with io.netty' group
         if (requested.group == "io.netty" && requested.name != "netty-bom" && requested.name != "netty") {
           useVersion("4.0.34.Final")
         }

instrumentation/rabbitmq-2.7/javaagent/build.gradle.kts

@@ -14,7 +14,7 @@ muzzle {
 dependencies {
   library("com.rabbitmq:amqp-client:2.7.0")
 
-  testLibrary ("org.springframework.amqp:spring-rabbit:1.1.0.RELEASE") {
+  testLibrary("org.springframework.amqp:spring-rabbit:1.1.0.RELEASE") {
     exclude("com.rabbitmq", "amqp-client")
   }
 

instrumentation/reactor-3.1/library/build.gradle.kts

@@ -11,4 +11,4 @@ dependencies {
 
   // Looks like later versions on reactor need this dependency for some reason even though it is marked as optional.
   latestDepTestLibrary("io.micrometer:micrometer-core:1.+")
-}
+}

instrumentation/reactor-3.1/testing/build.gradle.kts

@@ -10,4 +10,4 @@ dependencies {
   implementation("org.codehaus.groovy:groovy-all")
   implementation("io.opentelemetry:opentelemetry-api")
   implementation("org.spockframework:spock-core")
-}
+}

instrumentation/rediscala-1.8/javaagent/build.gradle.kts

@@ -54,4 +54,4 @@ tasks {
   named<Test>("test") {
     usesService(gradle.sharedServices.registrations["testcontainersBuildService"].getService())
   }
-}
+}

instrumentation/rmi/javaagent/build.gradle.kts

@@ -22,7 +22,7 @@ tasks {
       File(System.getProperty("java.home"), it).absoluteFile
     }.find { it.isFile() }?.let(File::toString) ?: "rmic"
 
-    commandLine(rmicBinaryPath, "-g", "-keep", "-classpath", sourceSets.test.get().output.classesDirs.asPath, "-d", "${buildDir}/classes/java/test", clazz)
+    commandLine(rmicBinaryPath, "-g", "-keep", "-classpath", sourceSets.test.get().output.classesDirs.asPath, "-d", "$buildDir/classes/java/test", clazz)
   }
 
   named<Test>("test") {

instrumentation/rocketmq-client-4.8/javaagent/build.gradle.kts

@@ -24,4 +24,4 @@ dependencies {
 
 tasks.withType<Test>().configureEach {
   jvmArgs("-Dotel.instrumentation.rocketmq-client.experimental-span-attributes=true")
-}
+}

instrumentation/rocketmq-client-4.8/library/build.gradle.kts

@@ -14,4 +14,4 @@ dependencies {
   // 4.9.1 seems to have a bug which makes on of our tests fail
   latestDepTestLibrary("org.apache.rocketmq:rocketmq-client:4.9.0")
   latestDepTestLibrary("org.apache.rocketmq:rocketmq-test:4.9.0")
-}
+}

instrumentation/runtime-metrics/library/build.gradle.kts

@@ -8,4 +8,4 @@ dependencies {
   testImplementation("io.opentelemetry:opentelemetry-sdk-metrics")
   testImplementation(project(":testing-common"))
   testImplementation("org.mockito:mockito-core")
-}
+}

instrumentation/spring/spring-batch-3.0/javaagent/build.gradle.kts

@@ -28,7 +28,7 @@ tasks {
     include("**/*ChunkRootSpanTest.*")
     jvmArgs("-Dotel.instrumentation.spring-batch.experimental.chunk.new-trace=true")
   }
-  
+
   val testItemLevelSpan by registering(Test::class) {
     filter {
       includeTestsMatching("*ItemLevelSpanTest")
@@ -38,7 +38,7 @@ tasks {
     include("**/*ItemLevelSpanTest.*", "**/*CustomSpanEventTest.*")
     jvmArgs("-Dotel.instrumentation.spring-batch.item.enabled=true")
   }
-  
+
   named<Test>("test") {
     dependsOn(testChunkRootSpan)
     dependsOn(testItemLevelSpan)

instrumentation/spring/spring-core-2.0/javaagent/build.gradle.kts

@@ -16,4 +16,4 @@ dependencies {
   // 3.0 introduces submit() methods
   // 4.0 introduces submitListenable() methods
   testLibrary("org.springframework:spring-core:4.0.0.RELEASE")
-}
+}

instrumentation/spring/spring-data-1.8/javaagent/build.gradle.kts

@@ -41,4 +41,3 @@ dependencies {
 
   latestDepTestLibrary("org.hibernate:hibernate-entitymanager:5.+")
 }
-

instrumentation/spring/spring-integration-4.1/javaagent/build.gradle.kts

@@ -2,7 +2,6 @@ plugins {
   id("otel.javaagent-instrumentation")
 }
 
-
 // context "leak" here is intentional: spring-integration instrumentation will always override
 // "local" span context with one extracted from the incoming message when it decides to start a
 // CONSUMER span

instrumentation/spring/spring-rabbit-1.0/javaagent/build.gradle.kts

@@ -27,4 +27,4 @@ tasks {
   named<Test>("test") {
     usesService(gradle.sharedServices.registrations["testcontainersBuildService"].getService())
   }
-}
+}

instrumentation/spring/spring-webmvc-3.1/wildfly-testing/build.gradle.kts

@@ -14,8 +14,8 @@ dependencies {
   testImplementation("javax.servlet:javax.servlet-api:3.1.0")
 
   val arquillianVersion = "1.4.0.Final"
-  testImplementation("org.jboss.arquillian.junit:arquillian-junit-container:${arquillianVersion}")
-  testImplementation("org.jboss.arquillian.protocol:arquillian-protocol-servlet:${arquillianVersion}")
+  testImplementation("org.jboss.arquillian.junit:arquillian-junit-container:$arquillianVersion")
+  testImplementation("org.jboss.arquillian.protocol:arquillian-protocol-servlet:$arquillianVersion")
   testImplementation("org.jboss.arquillian.spock:arquillian-spock-container:1.0.0.CR1")
   testImplementation("org.jboss.shrinkwrap:shrinkwrap-impl-base:1.2.6")
 

instrumentation/spring/starters/jaeger-exporter-starter/build.gradle.kts

@@ -13,4 +13,3 @@ dependencies {
   api("io.opentelemetry:opentelemetry-exporter-jaeger")
   implementation("io.grpc:grpc-netty-shaded:1.30.2")
 }
-

instrumentation/spring/starters/otlp-exporter-starter/build.gradle.kts

@@ -13,4 +13,3 @@ dependencies {
   api("io.opentelemetry:opentelemetry-exporter-otlp")
   implementation("io.grpc:grpc-netty-shaded:1.30.2")
 }
-

instrumentation/spring/starters/zipkin-exporter-starter/build.gradle.kts

@@ -12,4 +12,3 @@ dependencies {
   api(project(":instrumentation:spring:starters:spring-starter"))
   api("io.opentelemetry:opentelemetry-exporter-zipkin")
 }
-

instrumentation/struts-2.3/javaagent/build.gradle.kts

@@ -29,4 +29,3 @@ dependencies {
   testInstrumentation(project(":instrumentation:servlet:servlet-javax-common:javaagent"))
   testInstrumentation(project(":instrumentation:jetty:jetty-8.0:javaagent"))
 }
-

instrumentation/tapestry-5.4/javaagent/build.gradle.kts

@@ -25,4 +25,4 @@ dependencies {
   testInstrumentation(project(":instrumentation:jetty:jetty-8.0:javaagent"))
   testInstrumentation(project(":instrumentation:servlet:servlet-3.0:javaagent"))
   testInstrumentation(project(":instrumentation:servlet:servlet-javax-common:javaagent"))
-}
+}

instrumentation/tomcat/tomcat-7.0/javaagent/build.gradle.kts

@@ -24,4 +24,4 @@ dependencies {
   testLibrary("org.apache.tomcat.embed:tomcat-embed-jasper:8.0.41")
   latestDepTestLibrary("org.apache.tomcat.embed:tomcat-embed-core:[9.+, 10)")
   latestDepTestLibrary("org.apache.tomcat.embed:tomcat-embed-jasper:[9.+, 10)")
-}
+}

instrumentation/vaadin-14.2/javaagent/build.gradle.kts

@@ -26,7 +26,6 @@ muzzle {
   }
 }
 
-
 testSets {
   create("vaadin142Test")
   create("vaadin14LatestTest")

instrumentation/vertx-http-client/vertx-http-client-3.0/javaagent/build.gradle.kts

@@ -16,7 +16,7 @@ dependencies {
 
   implementation(project(":instrumentation:vertx-http-client:vertx-http-client-common:javaagent"))
 
-  //We need both version as different versions of Vert.x use different versions of Netty
+  // We need both version as different versions of Vert.x use different versions of Netty
   testInstrumentation(project(":instrumentation:netty:netty-4.0:javaagent"))
   testInstrumentation(project(":instrumentation:netty:netty-4.1:javaagent"))
 
@@ -30,4 +30,4 @@ tasks {
   named<Test>("test") {
     systemProperty("testLatestDeps", findProperty("testLatestDeps") as Boolean)
   }
-}
+}

instrumentation/vertx-http-client/vertx-http-client-4.0/javaagent/build.gradle.kts

@@ -17,4 +17,4 @@ dependencies {
   implementation(project(":instrumentation:vertx-http-client:vertx-http-client-common:javaagent"))
 
   testInstrumentation(project(":instrumentation:netty:netty-4.1:javaagent"))
-}
+}

instrumentation/vertx-http-client/vertx-http-client-common/javaagent/build.gradle.kts

@@ -4,4 +4,4 @@ plugins {
 
 dependencies {
   compileOnly("io.vertx:vertx-core:3.0.0")
-}
+}

instrumentation/vertx-reactive-3.5/javaagent/build.gradle.kts

@@ -22,12 +22,12 @@ tasks {
   }
 }
 
-//The first Vert.x version that uses rx-java 2
+// The first Vert.x version that uses rx-java 2
 val vertxVersion = "3.5.0"
 
 dependencies {
-  compileOnly("io.vertx:vertx-web:${vertxVersion}")
-  compileOnly("io.vertx:vertx-rx-java2:${vertxVersion}")
+  compileOnly("io.vertx:vertx-web:$vertxVersion")
+  compileOnly("io.vertx:vertx-rx-java2:$vertxVersion")
 
   testInstrumentation(project(":instrumentation:jdbc:javaagent"))
   testInstrumentation(project(":instrumentation:netty:netty-4.1:javaagent"))
@@ -38,11 +38,11 @@ dependencies {
 
   testImplementation("org.hsqldb:hsqldb:2.3.4")
 
-  add("version35TestImplementation", "io.vertx:vertx-web:${vertxVersion}")
-  add("version35TestImplementation", "io.vertx:vertx-rx-java2:${vertxVersion}")
-  add("version35TestImplementation", "io.vertx:vertx-web-client:${vertxVersion}")
-  add("version35TestImplementation", "io.vertx:vertx-jdbc-client:${vertxVersion}")
-  add("version35TestImplementation", "io.vertx:vertx-circuit-breaker:${vertxVersion}")
+  add("version35TestImplementation", "io.vertx:vertx-web:$vertxVersion")
+  add("version35TestImplementation", "io.vertx:vertx-rx-java2:$vertxVersion")
+  add("version35TestImplementation", "io.vertx:vertx-web-client:$vertxVersion")
+  add("version35TestImplementation", "io.vertx:vertx-jdbc-client:$vertxVersion")
+  add("version35TestImplementation", "io.vertx:vertx-circuit-breaker:$vertxVersion")
 
   add("latestDepTestImplementation", "io.vertx:vertx-web:4.+")
   add("latestDepTestImplementation", "io.vertx:vertx-rx-java2:4.+")

instrumentation/vertx-web-3.0/javaagent/build.gradle.kts

@@ -26,7 +26,7 @@ tasks {
 dependencies {
   compileOnly("io.vertx:vertx-web:3.0.0")
 
-  //We need both version as different versions of Vert.x use different versions of Netty
+  // We need both version as different versions of Vert.x use different versions of Netty
   testInstrumentation(project(":instrumentation:netty:netty-4.0:javaagent"))
   testInstrumentation(project(":instrumentation:netty:netty-4.1:javaagent"))
   testInstrumentation(project(":instrumentation:jdbc:javaagent"))

instrumentation/vertx-web-3.0/testing/build.gradle.kts

@@ -10,4 +10,4 @@ dependencies {
   implementation("org.codehaus.groovy:groovy-all")
   implementation("io.opentelemetry:opentelemetry-api")
   implementation("org.spockframework:spock-core")
-}
+}

javaagent/build.gradle.kts

@@ -122,7 +122,7 @@ tasks {
     archiveFileName.set("exporterLibs-relocated.jar")
   }
 
-  //Includes instrumentations, but not exporters
+  // Includes instrumentations, but not exporters
   val shadowJar by existing(ShadowJar::class) {
     configurations = listOf(bootstrapLibs)
 
@@ -143,7 +143,7 @@ tasks {
     }
   }
 
-  //Includes everything needed for OOTB experience
+  // Includes everything needed for OOTB experience
   val fullJavaagentJar by registering(ShadowJar::class) {
     configurations = listOf(bootstrapLibs)
 

muzzle/build.gradle.kts

@@ -32,4 +32,4 @@ dependencies {
   testImplementation("org.junit.jupiter:junit-jupiter-api")
   testImplementation("org.junit.jupiter:junit-jupiter-params")
   testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine")
-}
+}

smoke-tests/build.gradle.kts

@@ -75,7 +75,7 @@ tasks {
           exclude(it)
         }
       } else {
-        throw GradleException("Unknown smoke test suite: ${smokeTestSuite}")
+        throw GradleException("Unknown smoke test suite: $smokeTestSuite")
       }
     }
 
@@ -86,4 +86,4 @@ tasks {
       jvmArgs("-Dio.opentelemetry.smoketest.agent.shadowJar.path=${shadowTask.archiveFile.get()}")
     }
   }
-}
+}

testing/agent-for-testing/build.gradle.kts

@@ -42,7 +42,7 @@ dependencies {
   // Include instrumentations instrumenting core JDK classes tp ensure interoperability with other instrumentation
   javaagentLibs(project(":instrumentation:executors:javaagent"))
   // FIXME: we should enable this, but currently this fails tests for google http client
-  //testImplementation project(":instrumentation:http-url-connection:javaagent")
+  // testImplementation project(":instrumentation:http-url-connection:javaagent")
   javaagentLibs(project(":instrumentation:internal:internal-class-loader:javaagent"))
   javaagentLibs(project(":instrumentation:internal:internal-eclipse-osgi-3.6:javaagent"))
   javaagentLibs(project(":instrumentation:internal:internal-proxy:javaagent"))