Use plugins block everywhere for applying plugins (#3386)

* Use plugins block everywhere for applying plugins

* Actually it's library instrumentation

benchmark-e2e/benchmark-e2e.gradle

@@ -1,4 +1,6 @@
-apply plugin: "otel.java-conventions"
+plugins {
+  id("otel.java-conventions")
+}
 
 description = 'e2e benchmark'
 

benchmark-integration/benchmark-integration.gradle

@@ -1,8 +1,8 @@
 plugins {
-  id "com.github.johnrengelman.shadow"
+  id("com.github.johnrengelman.shadow")
-}
 
-apply plugin: "otel.java-conventions"
+  id("otel.java-conventions")
+}
 
 description = 'Integration Level Agent benchmarks.'
 
@@ -10,8 +10,5 @@ sourceCompatibility = 1.8
 targetCompatibility = 1.8
 
 subprojects { sub ->
-  sub.apply plugin: 'com.github.johnrengelman.shadow'
-  sub.apply plugin: "otel.java-conventions"
-
   javadoc.enabled = false
 }

benchmark-integration/jetty-perftest/jetty-perftest.gradle

@@ -1,3 +1,9 @@
+plugins {
+  id("com.github.johnrengelman.shadow")
+
+  id("otel.java-conventions")
+}
+
 dependencies {
   implementation project(':javaagent-bootstrap')
   implementation project(':benchmark-integration')

benchmark-integration/play-perftest/play-perftest.gradle

@@ -1,5 +1,8 @@
 plugins {
   id "org.gradle.playframework" version "0.9"
+  id("com.github.johnrengelman.shadow")
+
+  id("otel.java-conventions")
 }
 
 afterEvaluate {

benchmark/benchmark.gradle

@@ -1,9 +1,9 @@
 plugins {
-  id "me.champeau.jmh"
+  id("me.champeau.jmh")
-  id "com.github.johnrengelman.shadow"
+  id("com.github.johnrengelman.shadow")
-}
 
-apply plugin: "otel.java-conventions"
+  id("otel.java-conventions")
+}
 
 dependencies {
   jmh platform(project(":dependencyManagement"))

bom-alpha/bom-alpha.gradle

@@ -1,8 +1,8 @@
 plugins {
   id("java-platform")
-}
 
-apply plugin: "otel.publish-conventions"
+  id("otel.publish-conventions")
+}
 
 description = "OpenTelemetry Instrumentation Bill of Materials (Alpha)"
 group = "io.opentelemetry.instrumentation"

build.gradle

@@ -52,15 +52,6 @@ nexusPublishing {
 description = 'OpenTelemetry instrumentations for Java'
 
 allprojects {
-  apply plugin: 'idea'
-
-  idea {
-    module {
-      downloadJavadoc = false
-      downloadSources = false
-    }
-  }
-
   plugins.withId('net.ltgt.nullaway') {
     dependencies {
       errorprone "com.uber.nullaway:nullaway"
@@ -82,8 +73,6 @@ allprojects {
   }
 }
 
-apply plugin: 'com.diffplug.spotless'
-
 spotless {
   // this formatting is applied at the root level, as some of these files are not in a submodules
   // and would be missed otherwise

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

@@ -7,6 +7,7 @@ plugins {
   groovy
   checkstyle
   codenarc
+  idea
 
   id("org.gradle.test-retry")
 
@@ -251,3 +252,10 @@ checkstyle {
   toolVersion = "8.37"
   maxWarnings = 0
 }
+
+idea {
+  module {
+    setDownloadJavadoc(false)
+    setDownloadSources(false)
+  }
+}

docs/contributing/writing-instrumentation.md

@@ -155,7 +155,9 @@ from instrumented server or library will be used.
 
 Create a module called `compile-stub` and add `compile-stub.gradle` with following content
 ```
-apply plugin: "otel.java-conventions"
+plugins {
+  id("otel.java-conventions")
+}
 ```
 In javaagent module add compile only dependency with
 ```

instrumentation-api-caching/instrumentation-api-caching.gradle

@@ -1,12 +1,12 @@
 plugins {
-  id "com.github.johnrengelman.shadow"
+  id("com.github.johnrengelman.shadow")
+
+  id("otel.java-conventions")
+  id("otel.publish-conventions")
 }
 
 group = 'io.opentelemetry.instrumentation'
 
-apply plugin: "otel.java-conventions"
-apply plugin: "otel.publish-conventions"
-
 configurations {
   shadowInclude {
     canBeResolved = true

instrumentation-api/instrumentation-api.gradle

@@ -1,13 +1,12 @@
 plugins {
   id 'org.xbib.gradle.plugin.jflex' version '1.5.0'
+  id("otel.java-conventions")
+  id("otel.jacoco-conventions")
+  id("otel.publish-conventions")
 }
 
 group = 'io.opentelemetry.instrumentation'
 
-apply plugin: "otel.java-conventions"
-apply plugin: "otel.jacoco-conventions"
-apply plugin: "otel.publish-conventions"
-
 def jflexTargetDir = file"${project.buildDir}/generated/jflex/sql"
 
 def sqlSanitizerJflex = tasks.register("sqlSanitizerJflex", org.xbib.gradle.plugin.JFlexTask) {

instrumentation/akka-actor-2.5/javaagent/akka-actor-2.5-javaagent.gradle

@@ -1,5 +1,7 @@
-apply plugin: "otel.javaagent-instrumentation"
+plugins {
-apply plugin: "otel.scala-conventions"
+  id("otel.javaagent-instrumentation")
+  id("otel.scala-conventions")
+}
 
 muzzle {
   pass {

instrumentation/akka-actor-fork-join-2.5/javaagent/akka-actor-fork-join-2.5-javaagent.gradle

@@ -1,5 +1,7 @@
-apply plugin: "otel.javaagent-instrumentation"
+plugins {
-apply plugin: "otel.scala-conventions"
+  id("otel.javaagent-instrumentation")
+  id("otel.scala-conventions")
+}
 
 muzzle {
   pass {

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

@@ -1,5 +1,7 @@
-apply plugin: "otel.javaagent-instrumentation"
+plugins {
-apply plugin: "otel.scala-conventions"
+  id("otel.javaagent-instrumentation")
+  id("otel.scala-conventions")
+}
 
 muzzle {
   pass {

instrumentation/apache-camel-2.20/javaagent-unit-tests/apache-camel-2.20-javaagent-unit-tests.gradle

@@ -1,4 +1,6 @@
-apply plugin: "otel.java-conventions"
+plugins {
+  id("otel.java-conventions")
+}
 
 dependencies {
   testImplementation project(':instrumentation:apache-camel-2.20:javaagent')

instrumentation/apache-camel-2.20/javaagent/apache-camel-2.20-javaagent.gradle

@@ -1,4 +1,6 @@
-apply plugin: "otel.javaagent-instrumentation"
+plugins {
+  id("otel.javaagent-instrumentation")
+}
 
 muzzle {
   pass {

instrumentation/apache-dubbo-2.7/javaagent/apache-dubbo-2.7-javaagent.gradle

@@ -1,4 +1,6 @@
-apply plugin: "otel.javaagent-instrumentation"
+plugins {
+  id("otel.javaagent-instrumentation")
+}
 
 muzzle {
   pass {

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

@@ -1,4 +1,6 @@
-apply plugin: "otel.library-instrumentation"
+plugins {
+  id("otel.library-instrumentation")
+}
 
 dependencies {
   library "org.apache.dubbo:dubbo:2.7.0"

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

@@ -1,9 +1,7 @@
 plugins {
-  id "java-library"
+  id("otel.java-conventions")
 }
 
-apply plugin: "otel.java-conventions"
-
 def apacheDubboVersion = '2.7.5'
 
 dependencies {

instrumentation/apache-httpasyncclient-4.1/javaagent/apache-httpasyncclient-4.1-javaagent.gradle

@@ -1,4 +1,6 @@
-apply plugin: "otel.javaagent-instrumentation"
+plugins {
+  id("otel.javaagent-instrumentation")
+}
 
 muzzle {
   pass {

instrumentation/apache-httpclient/apache-httpclient-2.0/javaagent/apache-httpclient-2.0-javaagent.gradle

@@ -1,5 +1,6 @@
-apply plugin: "otel.javaagent-instrumentation"
+plugins {
-
+  id("otel.javaagent-instrumentation")
+}
 muzzle {
   pass {
     group = "commons-httpclient"

instrumentation/apache-httpclient/apache-httpclient-4.0/javaagent/apache-httpclient-4.0-javaagent.gradle

@@ -1,4 +1,6 @@
-apply plugin: "otel.javaagent-instrumentation"
+plugins {
+  id("otel.javaagent-instrumentation")
+}
 
 muzzle {
   fail {

instrumentation/apache-httpclient/apache-httpclient-5.0/javaagent/apache-httpclient-5.0-javaagent.gradle

@@ -1,4 +1,6 @@
-apply plugin: "otel.javaagent-instrumentation"
+plugins {
+  id("otel.javaagent-instrumentation")
+}
 
 muzzle {
   pass {

instrumentation/armeria-1.3/javaagent/armeria-1.3-javaagent.gradle

@@ -1,4 +1,6 @@
-apply plugin: "otel.javaagent-instrumentation"
+plugins {
+  id("otel.javaagent-instrumentation")
+}
 
 muzzle {
   pass {

instrumentation/armeria-1.3/library/armeria-1.3-library.gradle

@@ -1,5 +1,7 @@
-apply plugin: "otel.library-instrumentation"
+plugins {
-apply plugin: "net.ltgt.nullaway"
+  id("otel.library-instrumentation")
+  id("net.ltgt.nullaway")
+}
 
 dependencies {
   library "com.linecorp.armeria:armeria:1.3.0"

instrumentation/armeria-1.3/testing/armeria-1.3-testing.gradle

@@ -1,4 +1,6 @@
-apply plugin: "otel.java-conventions"
+plugins {
+  id("otel.java-conventions")
+}
 
 dependencies {
   api project(':testing-common')

instrumentation/async-http-client/async-http-client-1.9/javaagent/async-http-client-1.9-javaagent.gradle

@@ -1,4 +1,6 @@
-apply plugin: "otel.javaagent-instrumentation"
+plugins {
+  id("otel.javaagent-instrumentation")
+}
 
 muzzle {
   pass {

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

@@ -1,4 +1,6 @@
-apply plugin: "otel.javaagent-instrumentation"
+plugins {
+  id("otel.javaagent-instrumentation")
+}
 
 muzzle {
   pass {

instrumentation/aws-lambda-1.0/javaagent/aws-lambda-1.0-javaagent.gradle

@@ -1,20 +1,6 @@
-/*
+plugins {
- * Copyright The OpenTelemetry Authors
+  id("otel.javaagent-instrumentation")
- *
+}
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-apply plugin: "otel.javaagent-instrumentation"
 
 muzzle {
   pass {

instrumentation/aws-lambda-1.0/library/aws-lambda-1.0-library.gradle

@@ -1,19 +1,6 @@
-/*
+plugins {
- * Copyright The OpenTelemetry Authors
+  id("otel.library-instrumentation")
- *
+}
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-apply plugin: "otel.library-instrumentation"
 
 dependencies {
   compileOnly "io.opentelemetry:opentelemetry-sdk"

instrumentation/aws-lambda-1.0/testing/aws-lambda-1.0-testing.gradle

@@ -1,20 +1,6 @@
-/*
+plugins {
- * Copyright The OpenTelemetry Authors
+  id("otel.java-conventions")
- *
+}
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-apply plugin: "otel.java-conventions"
 
 dependencies {
   api project(':testing-common')

instrumentation/aws-sdk/aws-sdk-1.11/javaagent-unit-tests/aws-sdk-1.11-javaagent-unit-tests.gradle

@@ -1,4 +1,6 @@
-apply plugin: "otel.java-conventions"
+plugins {
+  id("otel.java-conventions")
+}
 
 dependencies {
   api project(':testing-common')

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

@@ -1,5 +1,7 @@
-apply plugin: "otel.javaagent-instrumentation"
+plugins {
-apply plugin: 'org.unbroken-dome.test-sets'
+  id("otel.javaagent-instrumentation")
+  id("org.unbroken-dome.test-sets")
+}
 
 // compiling against 1.11.0, but instrumentation should work against 1.10.33 with varying effects,
 // depending on the version's implementation. (i.e. DeleteOptionGroup may have less handlerCounts than

instrumentation/aws-sdk/aws-sdk-1.11/library/aws-sdk-1.11-library.gradle

@@ -1,4 +1,6 @@
-apply plugin: "otel.library-instrumentation"
+plugins {
+  id("otel.library-instrumentation")
+}
 
 dependencies {
   implementation "io.opentelemetry:opentelemetry-extension-aws"

instrumentation/aws-sdk/aws-sdk-1.11/testing/aws-sdk-1.11-testing.gradle

@@ -1,4 +1,6 @@
-apply plugin: "otel.java-conventions"
+plugins {
+  id("otel.java-conventions")
+}
 
 dependencies {
   api project(':testing-common')

instrumentation/aws-sdk/aws-sdk-2.2/javaagent/aws-sdk-2.2-javaagent.gradle

@@ -1,4 +1,6 @@
-apply plugin: "otel.javaagent-instrumentation"
+plugins {
+  id("otel.javaagent-instrumentation")
+}
 
 muzzle {
   pass {

instrumentation/aws-sdk/aws-sdk-2.2/library/aws-sdk-2.2-library.gradle

@@ -1,4 +1,6 @@
-apply plugin: "otel.library-instrumentation"
+plugins {
+  id("otel.library-instrumentation")
+}
 
 dependencies {
   implementation "io.opentelemetry:opentelemetry-extension-aws"

instrumentation/aws-sdk/aws-sdk-2.2/testing/aws-sdk-2.2-testing.gradle

@@ -1,4 +1,6 @@
-apply plugin: "otel.java-conventions"
+plugins {
+  id("otel.java-conventions")
+}
 
 dependencies {
   api project(':testing-common')

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

@@ -1,10 +1,11 @@
-// Set properties before any plugins get loaded
+plugins {
+  id("otel.javaagent-instrumentation")
+}
+
 ext {
   cassandraDriverTestVersions = "[3.0,4.0)"
 }
 
-apply plugin: "otel.javaagent-instrumentation"
-
 muzzle {
 
   pass {

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

@@ -1,4 +1,6 @@
-apply plugin: "otel.javaagent-instrumentation"
+plugins {
+  id("otel.javaagent-instrumentation")
+}
 
 muzzle {
   pass {

instrumentation/couchbase/couchbase-2.0/javaagent-unit-tests/couchbase-2.0-javaagent-unittests.gradle

@@ -1,4 +1,6 @@
-apply plugin: "otel.java-conventions"
+plugins {
+  id("otel.java-conventions")
+}
 
 dependencies {
   testImplementation "org.codehaus.groovy:groovy-all"

instrumentation/couchbase/couchbase-2.0/javaagent/couchbase-2.0-javaagent.gradle

@@ -1,4 +1,6 @@
-apply plugin: "otel.javaagent-instrumentation"
+plugins {
+  id("otel.javaagent-instrumentation")
+}
 
 muzzle {
   // Version 2.7.5 and 2.7.8 were not released properly and muzzle cannot test against it causing failure.

instrumentation/couchbase/couchbase-2.6/javaagent/couchbase-2.6-javaagent.gradle

@@ -1,4 +1,6 @@
-apply plugin: "otel.javaagent-instrumentation"
+plugins {
+  id("otel.javaagent-instrumentation")
+}
 
 muzzle {
   pass {

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

@@ -1,4 +1,6 @@
-apply plugin: "otel.javaagent-instrumentation"
+plugins {
+  id("otel.javaagent-instrumentation")
+}
 
 muzzle {
   pass {

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

@@ -1,4 +1,6 @@
-apply plugin: "otel.javaagent-instrumentation"
+plugins {
+  id("otel.javaagent-instrumentation")
+}
 
 muzzle {
   pass {

instrumentation/couchbase/couchbase-testing/couchbase-testing.gradle

@@ -1,4 +1,6 @@
-apply plugin: "otel.java-conventions"
+plugins {
+  id("otel.java-conventions")
+}
 
 dependencies {
   api project(':testing-common')

instrumentation/dropwizard-views-0.7/javaagent/dropwizard-views-0.7-javaagent.gradle

@@ -1,4 +1,6 @@
-apply plugin: "otel.javaagent-instrumentation"
+plugins {
+  id("otel.javaagent-instrumentation")
+}
 
 muzzle {
   pass {

instrumentation/elasticsearch/elasticsearch-rest-5.0/javaagent/elasticsearch-rest-5.0-javaagent.gradle

@@ -1,5 +1,7 @@
-apply plugin: "otel.javaagent-instrumentation"
+plugins {
-apply plugin: 'org.unbroken-dome.test-sets'
+  id("otel.javaagent-instrumentation")
+  id("org.unbroken-dome.test-sets")
+}
 
 muzzle {
   pass {

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

@@ -1,4 +1,6 @@
-apply plugin: "otel.javaagent-instrumentation"
+plugins {
+  id("otel.javaagent-instrumentation")
+}
 
 muzzle {
   pass {

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

@@ -1,4 +1,6 @@
-apply plugin: "otel.javaagent-instrumentation"
+plugins {
+  id("otel.javaagent-instrumentation")
+}
 
 muzzle {
   pass {

instrumentation/elasticsearch/elasticsearch-rest-common/library/elasticsearch-rest-common-library.gradle

@@ -1,4 +1,6 @@
-apply plugin: "otel.library-instrumentation"
+plugins {
+  id("otel.library-instrumentation")
+}
 
 dependencies {
   compileOnly "org.elasticsearch.client:rest:5.0.0"

instrumentation/elasticsearch/elasticsearch-transport-5.0/javaagent/elasticsearch-transport-5.0-javaagent.gradle

@@ -1,4 +1,6 @@
-apply plugin: "otel.javaagent-instrumentation"
+plugins {
+  id("otel.javaagent-instrumentation")
+}
 
 muzzle {
   pass {

instrumentation/elasticsearch/elasticsearch-transport-5.3/javaagent/elasticsearch-transport-5.3-javaagent.gradle

@@ -1,4 +1,6 @@
-apply plugin: "otel.javaagent-instrumentation"
+plugins {
+  id("otel.javaagent-instrumentation")
+}
 
 muzzle {
   pass {

instrumentation/elasticsearch/elasticsearch-transport-6.0/javaagent/elasticsearch-transport-6.0-javaagent.gradle

@@ -1,4 +1,6 @@
-apply plugin: "otel.javaagent-instrumentation"
+plugins {
+  id("otel.javaagent-instrumentation")
+}
 
 muzzle {
   pass {

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

@@ -1,3 +1,5 @@
-apply plugin: "otel.library-instrumentation"
+plugins {
+  id("otel.library-instrumentation")
+}
 
 // No dependencies, elasticsearch library not actually used here.

instrumentation/executors/javaagent/executors-javaagent.gradle

@@ -1,4 +1,6 @@
-apply plugin: "otel.javaagent-instrumentation"
+plugins {
+  id("otel.javaagent-instrumentation")
+}
 
 muzzle {
   pass {

instrumentation/external-annotations/javaagent-unit-tests/external-annotations-javaagent-unittests.gradle

@@ -1,4 +1,6 @@
-apply plugin: "otel.java-conventions"
+plugins {
+  id("otel.java-conventions")
+}
 
 dependencies {
   testImplementation project(':instrumentation-api')

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

@@ -1,4 +1,6 @@
-apply plugin: "otel.javaagent-instrumentation"
+plugins {
+  id("otel.javaagent-instrumentation")
+}
 
 muzzle {
   pass {

instrumentation/finatra-2.9/javaagent/finatra-2.9-javaagent.gradle

@@ -1,7 +1,8 @@
-apply plugin: "otel.javaagent-instrumentation"
+plugins {
-apply plugin: "otel.scala-conventions"
+  id("otel.javaagent-instrumentation")
-
+  id("otel.scala-conventions")
-apply plugin: 'org.unbroken-dome.test-sets'
+  id("org.unbroken-dome.test-sets")
+}
 
 testSets {
   // We need separate test sources to compile against latest Finatra.

instrumentation/geode-1.4/javaagent/geode-1.4-javaagent.gradle

@@ -1,4 +1,6 @@
-apply plugin: "otel.javaagent-instrumentation"
+plugins {
+  id("otel.javaagent-instrumentation")
+}
 
 muzzle {
   pass {

instrumentation/google-http-client-1.19/javaagent/google-http-client-1.19-javaagent.gradle

@@ -1,4 +1,6 @@
-apply plugin: "otel.javaagent-instrumentation"
+plugins {
+  id("otel.javaagent-instrumentation")
+}
 
 muzzle {
   pass {

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

@@ -1,4 +1,6 @@
-apply plugin: "otel.javaagent-instrumentation"
+plugins {
+  id("otel.javaagent-instrumentation")
+}
 
 muzzle {
   pass {

instrumentation/grizzly-2.0/javaagent/grizzly-2.0-javaagent.gradle

@@ -1,4 +1,6 @@
-apply plugin: "otel.javaagent-instrumentation"
+plugins {
+  id("otel.javaagent-instrumentation")
+}
 
 muzzle {
   pass {

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

@@ -1,20 +1,6 @@
-/*
+plugins {
- * Copyright The OpenTelemetry Authors
+  id("otel.javaagent-instrumentation")
- *
+}
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-apply plugin: "otel.javaagent-instrumentation"
 
 muzzle {
   pass {

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

@@ -1,4 +1,6 @@
-apply plugin: "otel.library-instrumentation"
+plugins {
+  id("otel.library-instrumentation")
+}
 
 def grpcVersion = '1.6.0'
 

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

@@ -1,10 +1,8 @@
 plugins {
-  id "java-library"
+  id("otel.java-conventions")
-  id "com.google.protobuf" version "0.8.16"
+  id("com.google.protobuf") version "0.8.16"
 }
 
-apply plugin: "otel.java-conventions"
-
 def grpcVersion = '1.6.0'
 
 protobuf {

instrumentation/guava-10.0/javaagent/guava-10.0-javaagent.gradle

@@ -1,4 +1,6 @@
-apply plugin: "otel.javaagent-instrumentation"
+plugins {
+  id("otel.javaagent-instrumentation")
+}
 
 muzzle {
   pass {

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

@@ -1,4 +1,6 @@
-apply plugin: "otel.library-instrumentation"
+plugins {
+  id("otel.library-instrumentation")
+}
 
 dependencies {
   library "com.google.guava:guava:10.0"

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

@@ -1,4 +1,6 @@
-apply plugin: "otel.javaagent-instrumentation"
+plugins {
+  id("otel.javaagent-instrumentation")
+}
 
 muzzle {
   pass {

instrumentation/hibernate/hibernate-3.3/javaagent/hibernate-3.3-javaagent.gradle

@@ -5,7 +5,9 @@
  * instrumentation isn't able to reference it.
  */
 
-apply plugin: "otel.javaagent-instrumentation"
+plugins {
+  id("otel.javaagent-instrumentation")
+}
 
 muzzle {
   pass {

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

@@ -1,5 +1,7 @@
-apply plugin: "otel.javaagent-instrumentation"
+plugins {
-apply plugin: 'org.unbroken-dome.test-sets'
+  id("otel.javaagent-instrumentation")
+  id("org.unbroken-dome.test-sets")
+}
 
 muzzle {
   pass {

instrumentation/hibernate/hibernate-common/javaagent/hibernate-common-javaagent.gradle

@@ -1,8 +1,9 @@
 /*
  * Classes that are common to all versions of the Hibernate instrumentation.
  */
-
+plugins {
-apply plugin: "otel.library-instrumentation"
+  id("otel.library-instrumentation")
+}
 
 dependencies {
   compileOnly project(':javaagent-api')

instrumentation/hibernate/hibernate-procedure-call-4.3/javaagent/hibernate-procedure-call-4.3-javaagent.gradle

@@ -1,4 +1,6 @@
-apply plugin: "otel.javaagent-instrumentation"
+plugins {
+  id("otel.javaagent-instrumentation")
+}
 
 muzzle {
   pass {

instrumentation/http-url-connection/javaagent/http-url-connection-javaagent.gradle

@@ -1,4 +1,6 @@
-apply plugin: "otel.javaagent-instrumentation"
+plugins {
+  id("otel.javaagent-instrumentation")
+}
 
 muzzle {
   pass {

instrumentation/hystrix-1.4/javaagent/hystrix-1.4-javaagent.gradle

@@ -1,4 +1,6 @@
-apply plugin: "otel.javaagent-instrumentation"
+plugins {
+  id("otel.javaagent-instrumentation")
+}
 
 muzzle {
   pass {

instrumentation/instrumentation.gradle

@@ -1,8 +1,8 @@
 // this project will run in isolation under the agent's classloader
 plugins {
-  id "otel.shadow-conventions"
+  id("otel.shadow-conventions")
+  id("otel.java-conventions")
 }
-apply plugin: "otel.java-conventions"
 
 Project instr_project = project
 subprojects {

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

@@ -1,4 +1,6 @@
-apply plugin: "otel.javaagent-instrumentation"
+plugins {
+  id("otel.javaagent-instrumentation")
+}
 
 dependencies {
   compileOnly project(':javaagent-bootstrap')

instrumentation/internal/internal-eclipse-osgi-3.6/javaagent/internal-eclipse-osgi-3.6-javaagent.gradle

@@ -1,4 +1,6 @@
-apply plugin: "otel.javaagent-instrumentation"
+plugins {
+  id("otel.javaagent-instrumentation")
+}
 
 // this instrumentation applies to the class 'org.eclipse.osgi.internal.loader.BundleLoader'
 // which is present in the following artifacts dating back to version 3.6 (2010):

instrumentation/internal/internal-proxy/javaagent-unit-tests/internal-proxy-javaagent-unit-tests.gradle

@@ -1,4 +1,6 @@
-apply plugin: "otel.java-conventions"
+plugins {
+  id("otel.java-conventions")
+}
 
 dependencies {
   testImplementation project(':instrumentation:internal:internal-proxy:javaagent')

instrumentation/internal/internal-proxy/javaagent/internal-proxy-javaagent.gradle

@@ -1,4 +1,6 @@
-apply plugin: "otel.javaagent-instrumentation"
+plugins {
+  id("otel.javaagent-instrumentation")
+}
 
 dependencies {
   compileOnly project(':javaagent-bootstrap')

instrumentation/internal/internal-url-class-loader/javaagent-integration-tests/internal-url-class-loader-javaagent-integration-tests.gradle

@@ -1,6 +1,6 @@
-ext.skipPublish = true
+plugins {
-
+  id("otel.javaagent-testing")
-apply plugin: "otel.javaagent-instrumentation"
+}
 
 dependencies {
   testImplementation "org.apache.commons:commons-lang3:3.12.0"

instrumentation/internal/internal-url-class-loader/javaagent/internal-url-class-loader-javaagent.gradle

@@ -1 +1,3 @@
-apply plugin: "otel.javaagent-instrumentation"
+plugins {
+  id("otel.javaagent-instrumentation")
+}

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

@@ -1,4 +1,6 @@
-apply plugin: "otel.javaagent-instrumentation"
+plugins {
+  id("otel.javaagent-instrumentation")
+}
 
 muzzle {
   pass {

instrumentation/jaxrs-client/jaxrs-client-1.1/javaagent/jaxrs-client-1.1-javaagent.gradle

@@ -1,4 +1,6 @@
-apply plugin: "otel.javaagent-instrumentation"
+plugins {
+  id("otel.javaagent-instrumentation")
+}
 
 muzzle {
   pass {

instrumentation/jaxrs-client/jaxrs-client-2.0/jaxrs-client-2.0-common/javaagent/jaxrs-client-2.0-common-javaagent.gradle

@@ -1,4 +1,6 @@
-apply plugin: "otel.javaagent-instrumentation"
+plugins {
+  id("otel.javaagent-instrumentation")
+}
 
 muzzle {
   pass {

instrumentation/jaxrs-client/jaxrs-client-2.0/jaxrs-client-2.0-cxf-3.0/javaagent/jaxrs-client-2.0-cxf-3.0-javaagent.gradle

@@ -1,4 +1,6 @@
-apply plugin: "otel.javaagent-instrumentation"
+plugins {
+  id("otel.javaagent-instrumentation")
+}
 
 muzzle {
   pass {

instrumentation/jaxrs-client/jaxrs-client-2.0/jaxrs-client-2.0-jersey-2.0/javaagent/jaxrs-client-2.0-jersey-2.0-javaagent.gradle

@@ -1,4 +1,6 @@
-apply plugin: "otel.javaagent-instrumentation"
+plugins {
+  id("otel.javaagent-instrumentation")
+}
 
 muzzle {
   pass {

instrumentation/jaxrs-client/jaxrs-client-2.0/jaxrs-client-2.0-resteasy-3.0/javaagent/jaxrs-client-2.0-resteasy-3.0-javaagent.gradle

@@ -1,4 +1,6 @@
-apply plugin: "otel.javaagent-instrumentation"
+plugins {
+  id("otel.javaagent-instrumentation")
+}
 
 muzzle {
   pass {

instrumentation/jaxrs/jaxrs-1.0/javaagent/jaxrs-1.0-javaagent.gradle

@@ -1,4 +1,6 @@
-apply plugin: "otel.javaagent-instrumentation"
+plugins {
+  id("otel.javaagent-instrumentation")
+}
 
 muzzle {
   pass {

instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-common/javaagent/jaxrs-2.0-common-javaagent.gradle

@@ -1,4 +1,6 @@
-apply plugin: "otel.javaagent-instrumentation"
+plugins {
+  id("otel.javaagent-instrumentation")
+}
 
 muzzle {
   fail {

instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-cxf-3.2/javaagent/jaxrs-2.0-cxf-3.2-javaagent.gradle

@@ -1,4 +1,6 @@
-apply plugin: "otel.javaagent-instrumentation"
+plugins {
+  id("otel.javaagent-instrumentation")
+}
 
 muzzle {
   // Cant assert fails because muzzle assumes all instrumentations will fail

instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-jersey-2.0/javaagent/jaxrs-2.0-jersey-2.0-javaagent.gradle

@@ -1,4 +1,6 @@
-apply plugin: "otel.javaagent-instrumentation"
+plugins {
+  id("otel.javaagent-instrumentation")
+}
 
 muzzle {
   // Cant assert fails because muzzle assumes all instrumentations will fail

instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-resteasy-3.0/javaagent/jaxrs-2.0-resteasy-3.0-javaagent.gradle

@@ -1,4 +1,6 @@
-apply plugin: "otel.javaagent-instrumentation"
+plugins {
+  id("otel.javaagent-instrumentation")
+}
 
 muzzle {
   // Cant assert fails because muzzle assumes all instrumentations will fail

instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-resteasy-3.1/javaagent/jaxrs-2.0-resteasy-3.1-javaagent.gradle

@@ -1,4 +1,6 @@
-apply plugin: "otel.javaagent-instrumentation"
+plugins {
+  id("otel.javaagent-instrumentation")
+}
 
 muzzle {
   // Cant assert fails because muzzle assumes all instrumentations will fail

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

@@ -1,4 +1,6 @@
-apply plugin: "otel.javaagent-instrumentation"
+plugins {
+  id("otel.javaagent-instrumentation")
+}
 
 dependencies {
   compileOnly "javax.ws.rs:javax.ws.rs-api:2.0"

instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-testing/jaxrs-2.0-testing.gradle

@@ -1,4 +1,6 @@
-apply plugin: "otel.java-conventions"
+plugins {
+  id("otel.java-conventions")
+}
 
 dependencies {
   api project(':testing-common')

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

@@ -1,4 +1,6 @@
-apply plugin: "otel.javaagent-instrumentation"
+plugins {
+  id("otel.javaagent-instrumentation")
+}
 
 muzzle {
   pass {

instrumentation/jaxws/jaxws-2.0-axis2-1.6/library/jaxws-2.0-axis2-1.6-library.gradle

@@ -1,4 +1,6 @@
-apply plugin: "otel.library-instrumentation"
+plugins {
+  id("otel.library-instrumentation")
+}
 
 dependencies {
   compileOnly "org.apache.axis2:axis2-jaxws:1.6.0"

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

@@ -1,4 +1,6 @@
-apply plugin: "otel.javaagent-instrumentation"
+plugins {
+  id("otel.javaagent-instrumentation")
+}
 
 muzzle {
   pass {

instrumentation/jaxws/jaxws-2.0-cxf-3.0/library/jaxws-2.0-cxf-3.0-library.gradle

@@ -1,4 +1,6 @@
-apply plugin: "otel.library-instrumentation"
+plugins {
+  id("otel.library-instrumentation")
+}
 
 dependencies {
   compileOnly "javax.servlet:javax.servlet-api:3.0.1"