From deb0e255cfae474d10f15bc4b4b9f666a31de267 Mon Sep 17 00:00:00 2001 From: Anuraag Agrawal Date: Thu, 24 Jun 2021 11:13:35 +0900 Subject: [PATCH] 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 | 4 +++- .../benchmark-integration.gradle | 9 +++------ .../jetty-perftest/jetty-perftest.gradle | 6 ++++++ .../play-perftest/play-perftest.gradle | 3 +++ benchmark/benchmark.gradle | 8 ++++---- bom-alpha/bom-alpha.gradle | 4 ++-- build.gradle | 11 ---------- .../kotlin/otel.java-conventions.gradle.kts | 8 ++++++++ docs/contributing/writing-instrumentation.md | 4 +++- .../instrumentation-api-caching.gradle | 8 ++++---- .../instrumentation-api.gradle | 7 +++---- .../javaagent/akka-actor-2.5-javaagent.gradle | 6 ++++-- .../akka-actor-fork-join-2.5-javaagent.gradle | 6 ++++-- .../javaagent/akka-http-10.0-javaagent.gradle | 6 ++++-- ...che-camel-2.20-javaagent-unit-tests.gradle | 4 +++- .../apache-camel-2.20-javaagent.gradle | 4 +++- .../apache-dubbo-2.7-javaagent.gradle | 4 +++- .../library/apache-dubbo-2.7-library.gradle | 4 +++- .../testing/apache-dubbo-2.7-testing.gradle | 4 +--- ...pache-httpasyncclient-4.1-javaagent.gradle | 4 +++- .../apache-httpclient-2.0-javaagent.gradle | 5 +++-- .../apache-httpclient-4.0-javaagent.gradle | 4 +++- .../apache-httpclient-5.0-javaagent.gradle | 4 +++- .../javaagent/armeria-1.3-javaagent.gradle | 4 +++- .../library/armeria-1.3-library.gradle | 6 ++++-- .../testing/armeria-1.3-testing.gradle | 4 +++- .../async-http-client-1.9-javaagent.gradle | 4 +++- .../async-http-client-2.0-javaagent.gradle | 4 +++- .../javaagent/aws-lambda-1.0-javaagent.gradle | 20 +++---------------- .../library/aws-lambda-1.0-library.gradle | 19 +++--------------- .../testing/aws-lambda-1.0-testing.gradle | 20 +++---------------- .../aws-sdk-1.11-javaagent-unit-tests.gradle | 4 +++- .../javaagent/aws-sdk-1.11-javaagent.gradle | 6 ++++-- .../library/aws-sdk-1.11-library.gradle | 4 +++- .../testing/aws-sdk-1.11-testing.gradle | 4 +++- .../javaagent/aws-sdk-2.2-javaagent.gradle | 4 +++- .../library/aws-sdk-2.2-library.gradle | 4 +++- .../testing/aws-sdk-2.2-testing.gradle | 4 +++- .../javaagent/cassandra-3.0-javaagent.gradle | 7 ++++--- .../javaagent/cassandra-4.0-javaagent.gradle | 4 +++- .../couchbase-2.0-javaagent-unittests.gradle | 4 +++- .../javaagent/couchbase-2.0-javaagent.gradle | 4 +++- .../javaagent/couchbase-2.6-javaagent.gradle | 4 +++- .../couchbase-3.1.6-javaagent.gradle | 4 +++- .../javaagent/couchbase-3.1-javaagent.gradle | 4 +++- .../couchbase-testing.gradle | 4 +++- .../dropwizard-views-0.7-javaagent.gradle | 4 +++- .../elasticsearch-rest-5.0-javaagent.gradle | 6 ++++-- .../elasticsearch-rest-6.4-javaagent.gradle | 4 +++- .../elasticsearch-rest-7.0-javaagent.gradle | 4 +++- .../elasticsearch-rest-common-library.gradle | 4 +++- ...asticsearch-transport-5.0-javaagent.gradle | 4 +++- ...asticsearch-transport-5.3-javaagent.gradle | 4 +++- ...asticsearch-transport-6.0-javaagent.gradle | 4 +++- ...sticsearch-transport-common-library.gradle | 4 +++- .../javaagent/executors-javaagent.gradle | 4 +++- ...nal-annotations-javaagent-unittests.gradle | 4 +++- .../external-annotations-javaagent.gradle | 4 +++- .../javaagent/finatra-2.9-javaagent.gradle | 9 +++++---- .../javaagent/geode-1.4-javaagent.gradle | 4 +++- .../google-http-client-1.19-javaagent.gradle | 4 +++- .../javaagent/grails-3.0-javaagent.gradle | 4 +++- .../javaagent/grizzly-2.0-javaagent.gradle | 4 +++- .../javaagent/grpc-1.6-javaagent.gradle | 20 +++---------------- .../grpc-1.6/library/grpc-1.6-library.gradle | 4 +++- .../grpc-1.6/testing/grpc-1.6-testing.gradle | 6 ++---- .../javaagent/guava-10.0-javaagent.gradle | 4 +++- .../library/guava-10.0-library.gradle | 4 +++- .../javaagent/gwt-2.0-javaagent.gradle | 4 +++- .../javaagent/hibernate-3.3-javaagent.gradle | 4 +++- .../javaagent/hibernate-4.0-javaagent.gradle | 6 ++++-- .../hibernate-common-javaagent.gradle | 5 +++-- ...ernate-procedure-call-4.3-javaagent.gradle | 4 +++- .../http-url-connection-javaagent.gradle | 4 +++- .../javaagent/hystrix-1.4-javaagent.gradle | 4 +++- instrumentation/instrumentation.gradle | 4 ++-- .../internal-class-loader-javaagent.gradle | 4 +++- ...internal-eclipse-osgi-3.6-javaagent.gradle | 4 +++- ...internal-proxy-javaagent-unit-tests.gradle | 4 +++- .../javaagent/internal-proxy-javaagent.gradle | 4 +++- ...-loader-javaagent-integration-tests.gradle | 6 +++--- ...internal-url-class-loader-javaagent.gradle | 4 +++- .../java-http-client-javaagent.gradle | 4 +++- .../jaxrs-client-1.1-javaagent.gradle | 4 +++- .../jaxrs-client-2.0-common-javaagent.gradle | 4 +++- .../jaxrs-client-2.0-cxf-3.0-javaagent.gradle | 4 +++- ...xrs-client-2.0-jersey-2.0-javaagent.gradle | 4 +++- ...s-client-2.0-resteasy-3.0-javaagent.gradle | 4 +++- .../javaagent/jaxrs-1.0-javaagent.gradle | 4 +++- .../jaxrs-2.0-common-javaagent.gradle | 4 +++- .../jaxrs-2.0-cxf-3.2-javaagent.gradle | 4 +++- .../jaxrs-2.0-jersey-2.0-javaagent.gradle | 4 +++- .../jaxrs-2.0-resteasy-3.0-javaagent.gradle | 4 +++- .../jaxrs-2.0-resteasy-3.1-javaagent.gradle | 4 +++- ...jaxrs-2.0-resteasy-common-javaagent.gradle | 4 +++- .../jaxrs-2.0-testing.gradle | 4 +++- .../jaxws-2.0-axis2-1.6-javaagent.gradle | 4 +++- .../jaxws-2.0-axis2-1.6-library.gradle | 4 +++- .../jaxws-2.0-cxf-3.0-javaagent.gradle | 4 +++- .../library/jaxws-2.0-cxf-3.0-library.gradle | 4 +++- .../jaxws-2.0-metro-2.2-javaagent.gradle | 4 +++- .../jaxws-2.0-testing.gradle | 3 +-- .../javaagent/jaxws-2.0-javaagent.gradle | 4 +++- .../javaagent/jws-1.1-javaagent.gradle | 4 +++- .../jdbc-javaagent-unit-tests.gradle | 4 +++- .../jdbc/javaagent/jdbc-javaagent.gradle | 4 +++- .../javaagent/jedis-1.4-javaagent.gradle | 4 +++- .../javaagent/jedis-3.0-javaagent.gradle | 4 +++- .../javaagent/jetty-11.0-javaagent.gradle | 4 +++- .../javaagent/jetty-8.0-javaagent.gradle | 4 +++- .../javaagent/jetty-common-javaagent.gradle | 4 +++- .../jms-1.1-javaagent-unit-tests.gradle | 4 +++- .../javaagent/jms-1.1-javaagent.gradle | 6 ++++-- .../library/jsf-common-library.gradle | 4 +++- .../jsf-testing-common.gradle | 4 +++- .../javaagent/mojarra-1.2-javaagent.gradle | 6 ++++-- .../javaagent/myfaces-1.2-javaagent.gradle | 6 ++++-- .../javaagent/jsp-2.3-javaagent.gradle | 4 +++- .../kafka-clients-0.11-javaagent.gradle | 4 +++- .../kafka-streams-0.11-javaagent.gradle | 4 +++- .../kotlinx-coroutines-javaagent.gradle | 5 ++--- ...tes-client-7.0-javaagent-unit-tests.gradle | 4 +++- .../kubernetes-client-7.0-javaagent.gradle | 4 +++- .../javaagent/lettuce-4.0-javaagent.gradle | 4 +++- .../javaagent/lettuce-5.0-javaagent.gradle | 4 +++- .../javaagent/lettuce-5.1-javaagent.gradle | 4 +++- .../library/lettuce-5.1-library.gradle | 6 ++++-- .../testing/lettuce-5.1-testing.gradle | 4 +++- .../library/lettuce-common-library.gradle | 12 +++-------- .../liberty/compile-stub/compile-stub.gradle | 4 +++- .../liberty-dispatcher-javaagent.gradle | 4 +++- .../javaagent/liberty-javaagent.gradle | 4 +++- .../javaagent/log4j-1.2-javaagent.gradle | 4 +++- .../log4j-2-testing/log4j-2-testing.gradle | 4 +++- .../javaagent/log4j-2.13.2-javaagent.gradle | 6 ++++-- .../library/log4j-2.13.2-library.gradle | 4 +++- .../javaagent/log4j-2.7-javaagent.gradle | 4 +++- .../javaagent/logback-1.0-javaagent.gradle | 4 +++- .../library/logback-1.0-library.gradle | 4 +++- .../testing/logback-1.0-testing.gradle | 20 +++---------------- .../javaagent/methods-javaagent.gradle | 4 +++- .../javaagent/mongo-3.1-javaagent.gradle | 4 +++- .../library/mongo-3.1-library.gradle | 6 ++++-- .../testing/mongo-3.1-testing.gradle | 4 +++- .../javaagent/mongo-3.7-javaagent.gradle | 4 +++- .../javaagent/mongo-4.0-javaagent.gradle | 4 +++- .../mongo-async-3.3-javaagent.gradle | 4 +++- .../mongo/mongo-testing/mongo-testing.gradle | 4 +++- .../javaagent/netty-3.8-javaagent.gradle | 4 +++- .../javaagent/netty-4-common-javaagent.gradle | 4 +++- .../javaagent/netty-4.0-javaagent.gradle | 4 +++- .../javaagent/netty-4.1-javaagent.gradle | 4 +++- .../library/netty-4.1-library.gradle | 4 +++- .../javaagent/okhttp-2.2-javaagent.gradle | 4 +++- .../javaagent/okhttp-3.0-javaagent.gradle | 4 +++- .../library/okhttp-3.0-library.gradle | 6 ++++-- .../testing/okhttp-3.0-testing.gradle | 4 +++- ...telemetry-annotations-1.0-javaagent.gradle | 4 +++- .../opentelemetry-api-1.0-javaagent.gradle | 4 +++- ...telemetry-api-metrics-1.0-javaagent.gradle | 4 +++- .../oshi/javaagent/oshi-javaagent.gradle | 4 +++- .../oshi/library/oshi-library.gradle | 4 +++- .../javaagent/play-ws-1.0-javaagent.gradle | 4 +++- .../javaagent/play-ws-2.0-javaagent.gradle | 4 +++- .../javaagent/play-ws-2.1-javaagent.gradle | 4 +++- .../javaagent/play-ws-common-javaagent.gradle | 4 +++- .../play-ws-testing/play-ws-testing.gradle | 4 +++- .../javaagent/play-2.4-javaagent.gradle | 4 +++- .../javaagent/play-2.6-javaagent.gradle | 4 +++- .../javaagent/rabbitmq-2.7-javaagent.gradle | 4 +++- .../javaagent/ratpack-1.4-javaagent.gradle | 4 +++- .../javaagent/reactor-3.1-javaagent.gradle | 4 +++- .../library/reactor-3.1-library.gradle | 4 +++- .../testing/reactor-3.1-testing.gradle | 4 +++- .../reactor-netty-0.9-javaagent.gradle | 4 +++- .../reactor-netty-1.0-javaagent.gradle | 4 +++- .../javaagent/rediscala-1.8-javaagent.gradle | 4 +++- .../javaagent/redisson-3.0-javaagent.gradle | 4 +++- .../rmi/javaagent/rmi-javaagent.gradle | 4 +++- .../rocketmq-client-4.8-javaagent.gradle | 4 +++- .../rocketmq-client-4.8-library.gradle | 4 +++- .../rocketmq-client-4.8-testing.gradle | 4 +++- .../runtime-metrics-javaagent.gradle | 4 +++- .../library/runtime-metrics-library.gradle | 4 +++- .../library/rxjava-1.0-library.gradle | 4 +++- .../javaagent/rxjava-2.0-javaagent.gradle | 4 +++- .../library/rxjava-2.0-library.gradle | 4 +++- .../testing/rxjava-2.0-testing.gradle | 4 +++- .../javaagent/rxjava-3.0-javaagent.gradle | 4 +++- .../library/rxjava-3.0-library.gradle | 4 +++- .../testing/rxjava-3.0-testing.gradle | 4 +++- .../scala-executors-javaagent.gradle | 8 +++++--- .../javaagent/servlet-2.2-javaagent.gradle | 4 +++- .../library/servlet-2.2-library.gradle | 4 +++- .../javaagent/servlet-3.0-javaagent.gradle | 5 +++-- .../library/servlet-3.0-library.gradle | 4 +++- .../javaagent/servlet-5.0-javaagent.gradle | 4 +++- .../library/servlet-5.0-library.gradle | 4 +++- .../javaagent/servlet-common-javaagent.gradle | 4 +++- .../library/servlet-common-library.gradle | 4 +++- .../servlet-javax-common-javaagent.gradle | 4 +++- .../servlet-javax-common-library.gradle | 4 +++- .../javaagent/spark-2.3-javaagent.gradle | 4 +++- .../spring-batch-3.0-javaagent.gradle | 4 +++- .../spring-boot-autoconfigure.gradle | 8 +++++--- .../spring-core-2.0-javaagent.gradle | 4 +++- .../spring-data-1.8-javaagent.gradle | 4 +++- .../spring-integration-4.1-javaagent.gradle | 4 +++- .../spring-integration-4.1-library.gradle | 4 +++- .../spring-integration-4.1-testing.gradle | 4 +++- .../spring-scheduling-3.1-javaagent.gradle | 4 +++- .../library/spring-web-3.1-library.gradle | 4 +++- .../spring-webflux-5.0-javaagent.gradle | 4 +++- .../library/spring-webflux-5.0-library.gradle | 4 +++- .../spring-webmvc-3.1-javaagent.gradle | 4 +++- .../library/spring-webmvc-3.1-library.gradle | 4 +++- .../javaagent/spring-ws-2.0-javaagent.gradle | 3 +-- .../jaeger-exporter-starter.gradle | 10 +++++----- .../otlp-exporter-starter.gradle | 10 +++++----- .../spring-starter/spring-starter.gradle | 10 +++++----- .../zipkin-exporter-starter.gradle | 10 +++++----- .../spymemcached-2.12-javaagent.gradle | 4 +++- .../javaagent/struts-2.3-javaagent.gradle | 4 +++- .../javaagent/tapestry-5.4-javaagent.gradle | 4 +++- .../javaagent/tomcat-10.0-javaagent.gradle | 4 +++- .../javaagent/tomcat-7.0-javaagent.gradle | 4 +++- .../javaagent/tomcat-common-javaagent.gradle | 4 +++- .../javaagent/twilio-6.6-javaagent.gradle | 4 +++- .../javaagent/undertow-1.4-javaagent.gradle | 4 +++- .../javaagent/vaadin-14.2-javaagent.gradle | 6 ++++-- .../vertx-reactive-3.5-javaagent.gradle | 4 +++- .../javaagent/vertx-web-3.0-javaagent.gradle | 4 +++- .../javaagent/wicket-8.0-javaagent.gradle | 4 +++- javaagent-api/javaagent-api.gradle | 9 ++++++--- .../javaagent-bootstrap-tests.gradle | 4 +++- .../javaagent-bootstrap.gradle | 8 +++++--- .../javaagent-exporters.gradle | 4 ++-- .../javaagent-extension-api.gradle | 8 +++++--- javaagent-tooling/javaagent-tooling.gradle | 8 +++++--- javaagent/javaagent.gradle | 6 +++--- ...emetry-api-shaded-for-instrumenting.gradle | 6 +++--- ...nnotations-shaded-for-instrumenting.gradle | 6 +++--- settings.gradle | 2 -- smoke-tests/smoke-tests.gradle | 4 +++- .../library-for-integration-tests.gradle | 4 +++- testing-common/testing-common.gradle | 8 +++++--- testing/agent-exporter/agent-exporter.gradle | 6 +++--- .../agent-for-testing.gradle | 8 ++++---- .../armeria-shaded-for-testing.gradle | 8 ++++---- 249 files changed, 783 insertions(+), 439 deletions(-) diff --git a/benchmark-e2e/benchmark-e2e.gradle b/benchmark-e2e/benchmark-e2e.gradle index a72aa0793a..712a406494 100644 --- a/benchmark-e2e/benchmark-e2e.gradle +++ b/benchmark-e2e/benchmark-e2e.gradle @@ -1,4 +1,6 @@ -apply plugin: "otel.java-conventions" +plugins { + id("otel.java-conventions") +} description = 'e2e benchmark' diff --git a/benchmark-integration/benchmark-integration.gradle b/benchmark-integration/benchmark-integration.gradle index a88d834973..f33d915369 100644 --- a/benchmark-integration/benchmark-integration.gradle +++ b/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 } diff --git a/benchmark-integration/jetty-perftest/jetty-perftest.gradle b/benchmark-integration/jetty-perftest/jetty-perftest.gradle index c841893ad0..2bbe5b068c 100644 --- a/benchmark-integration/jetty-perftest/jetty-perftest.gradle +++ b/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') diff --git a/benchmark-integration/play-perftest/play-perftest.gradle b/benchmark-integration/play-perftest/play-perftest.gradle index e16082c33a..0c518850fb 100644 --- a/benchmark-integration/play-perftest/play-perftest.gradle +++ b/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 { diff --git a/benchmark/benchmark.gradle b/benchmark/benchmark.gradle index e879143cde..e7fe52fd5d 100644 --- a/benchmark/benchmark.gradle +++ b/benchmark/benchmark.gradle @@ -1,9 +1,9 @@ plugins { - id "me.champeau.jmh" - id "com.github.johnrengelman.shadow" -} + id("me.champeau.jmh") + id("com.github.johnrengelman.shadow") -apply plugin: "otel.java-conventions" + id("otel.java-conventions") +} dependencies { jmh platform(project(":dependencyManagement")) diff --git a/bom-alpha/bom-alpha.gradle b/bom-alpha/bom-alpha.gradle index bfc04b0427..46caa782de 100644 --- a/bom-alpha/bom-alpha.gradle +++ b/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" diff --git a/build.gradle b/build.gradle index 0507569b7c..9ea7ee6d5a 100644 --- a/build.gradle +++ b/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 diff --git a/buildSrc/src/main/kotlin/otel.java-conventions.gradle.kts b/buildSrc/src/main/kotlin/otel.java-conventions.gradle.kts index 05fe4bcf7a..e2f730d516 100644 --- a/buildSrc/src/main/kotlin/otel.java-conventions.gradle.kts +++ b/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) + } +} diff --git a/docs/contributing/writing-instrumentation.md b/docs/contributing/writing-instrumentation.md index 0be2124a9b..d56984f521 100644 --- a/docs/contributing/writing-instrumentation.md +++ b/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 ``` diff --git a/instrumentation-api-caching/instrumentation-api-caching.gradle b/instrumentation-api-caching/instrumentation-api-caching.gradle index 1d6dd03e66..adb8cc1a2b 100644 --- a/instrumentation-api-caching/instrumentation-api-caching.gradle +++ b/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 diff --git a/instrumentation-api/instrumentation-api.gradle b/instrumentation-api/instrumentation-api.gradle index bd536af1ae..3c94ec2474 100644 --- a/instrumentation-api/instrumentation-api.gradle +++ b/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) { diff --git a/instrumentation/akka-actor-2.5/javaagent/akka-actor-2.5-javaagent.gradle b/instrumentation/akka-actor-2.5/javaagent/akka-actor-2.5-javaagent.gradle index 6a4e55e047..a30babd9fb 100644 --- a/instrumentation/akka-actor-2.5/javaagent/akka-actor-2.5-javaagent.gradle +++ b/instrumentation/akka-actor-2.5/javaagent/akka-actor-2.5-javaagent.gradle @@ -1,5 +1,7 @@ -apply plugin: "otel.javaagent-instrumentation" -apply plugin: "otel.scala-conventions" +plugins { + id("otel.javaagent-instrumentation") + id("otel.scala-conventions") +} muzzle { pass { diff --git a/instrumentation/akka-actor-fork-join-2.5/javaagent/akka-actor-fork-join-2.5-javaagent.gradle b/instrumentation/akka-actor-fork-join-2.5/javaagent/akka-actor-fork-join-2.5-javaagent.gradle index 301d97b346..74a2015e05 100644 --- a/instrumentation/akka-actor-fork-join-2.5/javaagent/akka-actor-fork-join-2.5-javaagent.gradle +++ b/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" -apply plugin: "otel.scala-conventions" +plugins { + id("otel.javaagent-instrumentation") + id("otel.scala-conventions") +} muzzle { pass { diff --git a/instrumentation/akka-http-10.0/javaagent/akka-http-10.0-javaagent.gradle b/instrumentation/akka-http-10.0/javaagent/akka-http-10.0-javaagent.gradle index f1f14fa517..0780990f5e 100644 --- a/instrumentation/akka-http-10.0/javaagent/akka-http-10.0-javaagent.gradle +++ b/instrumentation/akka-http-10.0/javaagent/akka-http-10.0-javaagent.gradle @@ -1,5 +1,7 @@ -apply plugin: "otel.javaagent-instrumentation" -apply plugin: "otel.scala-conventions" +plugins { + id("otel.javaagent-instrumentation") + id("otel.scala-conventions") +} muzzle { pass { diff --git a/instrumentation/apache-camel-2.20/javaagent-unit-tests/apache-camel-2.20-javaagent-unit-tests.gradle b/instrumentation/apache-camel-2.20/javaagent-unit-tests/apache-camel-2.20-javaagent-unit-tests.gradle index 8a24b1f60a..6727023630 100644 --- a/instrumentation/apache-camel-2.20/javaagent-unit-tests/apache-camel-2.20-javaagent-unit-tests.gradle +++ b/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') diff --git a/instrumentation/apache-camel-2.20/javaagent/apache-camel-2.20-javaagent.gradle b/instrumentation/apache-camel-2.20/javaagent/apache-camel-2.20-javaagent.gradle index af7dd44cdf..a18dedbe3b 100644 --- a/instrumentation/apache-camel-2.20/javaagent/apache-camel-2.20-javaagent.gradle +++ b/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 { diff --git a/instrumentation/apache-dubbo-2.7/javaagent/apache-dubbo-2.7-javaagent.gradle b/instrumentation/apache-dubbo-2.7/javaagent/apache-dubbo-2.7-javaagent.gradle index 04118a201b..596a0105ae 100644 --- a/instrumentation/apache-dubbo-2.7/javaagent/apache-dubbo-2.7-javaagent.gradle +++ b/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 { diff --git a/instrumentation/apache-dubbo-2.7/library/apache-dubbo-2.7-library.gradle b/instrumentation/apache-dubbo-2.7/library/apache-dubbo-2.7-library.gradle index dc8cf03998..6ef9b728a6 100644 --- a/instrumentation/apache-dubbo-2.7/library/apache-dubbo-2.7-library.gradle +++ b/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" diff --git a/instrumentation/apache-dubbo-2.7/testing/apache-dubbo-2.7-testing.gradle b/instrumentation/apache-dubbo-2.7/testing/apache-dubbo-2.7-testing.gradle index c17f36e30e..e1c66c9d5d 100644 --- a/instrumentation/apache-dubbo-2.7/testing/apache-dubbo-2.7-testing.gradle +++ b/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 { diff --git a/instrumentation/apache-httpasyncclient-4.1/javaagent/apache-httpasyncclient-4.1-javaagent.gradle b/instrumentation/apache-httpasyncclient-4.1/javaagent/apache-httpasyncclient-4.1-javaagent.gradle index 32d60ea557..c9910a61a3 100644 --- a/instrumentation/apache-httpasyncclient-4.1/javaagent/apache-httpasyncclient-4.1-javaagent.gradle +++ b/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 { diff --git a/instrumentation/apache-httpclient/apache-httpclient-2.0/javaagent/apache-httpclient-2.0-javaagent.gradle b/instrumentation/apache-httpclient/apache-httpclient-2.0/javaagent/apache-httpclient-2.0-javaagent.gradle index d1f11483bb..c1ad97baaf 100644 --- a/instrumentation/apache-httpclient/apache-httpclient-2.0/javaagent/apache-httpclient-2.0-javaagent.gradle +++ b/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" diff --git a/instrumentation/apache-httpclient/apache-httpclient-4.0/javaagent/apache-httpclient-4.0-javaagent.gradle b/instrumentation/apache-httpclient/apache-httpclient-4.0/javaagent/apache-httpclient-4.0-javaagent.gradle index 721eb49a06..49ac47711e 100644 --- a/instrumentation/apache-httpclient/apache-httpclient-4.0/javaagent/apache-httpclient-4.0-javaagent.gradle +++ b/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 { diff --git a/instrumentation/apache-httpclient/apache-httpclient-5.0/javaagent/apache-httpclient-5.0-javaagent.gradle b/instrumentation/apache-httpclient/apache-httpclient-5.0/javaagent/apache-httpclient-5.0-javaagent.gradle index 71aec63a89..1522e2e5d7 100644 --- a/instrumentation/apache-httpclient/apache-httpclient-5.0/javaagent/apache-httpclient-5.0-javaagent.gradle +++ b/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 { diff --git a/instrumentation/armeria-1.3/javaagent/armeria-1.3-javaagent.gradle b/instrumentation/armeria-1.3/javaagent/armeria-1.3-javaagent.gradle index 546fac556d..7acb408360 100644 --- a/instrumentation/armeria-1.3/javaagent/armeria-1.3-javaagent.gradle +++ b/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 { diff --git a/instrumentation/armeria-1.3/library/armeria-1.3-library.gradle b/instrumentation/armeria-1.3/library/armeria-1.3-library.gradle index 245497a09e..4f70b45ec6 100644 --- a/instrumentation/armeria-1.3/library/armeria-1.3-library.gradle +++ b/instrumentation/armeria-1.3/library/armeria-1.3-library.gradle @@ -1,5 +1,7 @@ -apply plugin: "otel.library-instrumentation" -apply plugin: "net.ltgt.nullaway" +plugins { + id("otel.library-instrumentation") + id("net.ltgt.nullaway") +} dependencies { library "com.linecorp.armeria:armeria:1.3.0" diff --git a/instrumentation/armeria-1.3/testing/armeria-1.3-testing.gradle b/instrumentation/armeria-1.3/testing/armeria-1.3-testing.gradle index c781d46a19..f1fb500dc1 100644 --- a/instrumentation/armeria-1.3/testing/armeria-1.3-testing.gradle +++ b/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') diff --git a/instrumentation/async-http-client/async-http-client-1.9/javaagent/async-http-client-1.9-javaagent.gradle b/instrumentation/async-http-client/async-http-client-1.9/javaagent/async-http-client-1.9-javaagent.gradle index d56e9ae04b..21703305b6 100644 --- a/instrumentation/async-http-client/async-http-client-1.9/javaagent/async-http-client-1.9-javaagent.gradle +++ b/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 { diff --git a/instrumentation/async-http-client/async-http-client-2.0/javaagent/async-http-client-2.0-javaagent.gradle b/instrumentation/async-http-client/async-http-client-2.0/javaagent/async-http-client-2.0-javaagent.gradle index 0e97884459..261eb901df 100644 --- a/instrumentation/async-http-client/async-http-client-2.0/javaagent/async-http-client-2.0-javaagent.gradle +++ b/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 { diff --git a/instrumentation/aws-lambda-1.0/javaagent/aws-lambda-1.0-javaagent.gradle b/instrumentation/aws-lambda-1.0/javaagent/aws-lambda-1.0-javaagent.gradle index 88a67214ed..d9e49de126 100644 --- a/instrumentation/aws-lambda-1.0/javaagent/aws-lambda-1.0-javaagent.gradle +++ b/instrumentation/aws-lambda-1.0/javaagent/aws-lambda-1.0-javaagent.gradle @@ -1,20 +1,6 @@ -/* - * Copyright The OpenTelemetry Authors - * - * 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" +plugins { + id("otel.javaagent-instrumentation") +} muzzle { pass { diff --git a/instrumentation/aws-lambda-1.0/library/aws-lambda-1.0-library.gradle b/instrumentation/aws-lambda-1.0/library/aws-lambda-1.0-library.gradle index af2ba13327..c11679c38d 100644 --- a/instrumentation/aws-lambda-1.0/library/aws-lambda-1.0-library.gradle +++ b/instrumentation/aws-lambda-1.0/library/aws-lambda-1.0-library.gradle @@ -1,19 +1,6 @@ -/* - * Copyright The OpenTelemetry Authors - * - * 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" +plugins { + id("otel.library-instrumentation") +} dependencies { compileOnly "io.opentelemetry:opentelemetry-sdk" diff --git a/instrumentation/aws-lambda-1.0/testing/aws-lambda-1.0-testing.gradle b/instrumentation/aws-lambda-1.0/testing/aws-lambda-1.0-testing.gradle index 8e34325e77..c3d5b91c01 100644 --- a/instrumentation/aws-lambda-1.0/testing/aws-lambda-1.0-testing.gradle +++ b/instrumentation/aws-lambda-1.0/testing/aws-lambda-1.0-testing.gradle @@ -1,20 +1,6 @@ -/* - * Copyright The OpenTelemetry Authors - * - * 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" +plugins { + id("otel.java-conventions") +} dependencies { api project(':testing-common') diff --git a/instrumentation/aws-sdk/aws-sdk-1.11/javaagent-unit-tests/aws-sdk-1.11-javaagent-unit-tests.gradle b/instrumentation/aws-sdk/aws-sdk-1.11/javaagent-unit-tests/aws-sdk-1.11-javaagent-unit-tests.gradle index 208b78bfc9..3cc6062b6e 100644 --- a/instrumentation/aws-sdk/aws-sdk-1.11/javaagent-unit-tests/aws-sdk-1.11-javaagent-unit-tests.gradle +++ b/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') diff --git a/instrumentation/aws-sdk/aws-sdk-1.11/javaagent/aws-sdk-1.11-javaagent.gradle b/instrumentation/aws-sdk/aws-sdk-1.11/javaagent/aws-sdk-1.11-javaagent.gradle index d90738a56f..e09732bcb3 100644 --- a/instrumentation/aws-sdk/aws-sdk-1.11/javaagent/aws-sdk-1.11-javaagent.gradle +++ b/instrumentation/aws-sdk/aws-sdk-1.11/javaagent/aws-sdk-1.11-javaagent.gradle @@ -1,5 +1,7 @@ -apply plugin: "otel.javaagent-instrumentation" -apply plugin: 'org.unbroken-dome.test-sets' +plugins { + 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 diff --git a/instrumentation/aws-sdk/aws-sdk-1.11/library/aws-sdk-1.11-library.gradle b/instrumentation/aws-sdk/aws-sdk-1.11/library/aws-sdk-1.11-library.gradle index 16d4564dc6..1bd2c9b3cf 100644 --- a/instrumentation/aws-sdk/aws-sdk-1.11/library/aws-sdk-1.11-library.gradle +++ b/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" diff --git a/instrumentation/aws-sdk/aws-sdk-1.11/testing/aws-sdk-1.11-testing.gradle b/instrumentation/aws-sdk/aws-sdk-1.11/testing/aws-sdk-1.11-testing.gradle index 0c284bd322..4659656338 100644 --- a/instrumentation/aws-sdk/aws-sdk-1.11/testing/aws-sdk-1.11-testing.gradle +++ b/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') diff --git a/instrumentation/aws-sdk/aws-sdk-2.2/javaagent/aws-sdk-2.2-javaagent.gradle b/instrumentation/aws-sdk/aws-sdk-2.2/javaagent/aws-sdk-2.2-javaagent.gradle index 9f32c0313c..b225417176 100644 --- a/instrumentation/aws-sdk/aws-sdk-2.2/javaagent/aws-sdk-2.2-javaagent.gradle +++ b/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 { diff --git a/instrumentation/aws-sdk/aws-sdk-2.2/library/aws-sdk-2.2-library.gradle b/instrumentation/aws-sdk/aws-sdk-2.2/library/aws-sdk-2.2-library.gradle index eb93a1748d..a5e2d90056 100644 --- a/instrumentation/aws-sdk/aws-sdk-2.2/library/aws-sdk-2.2-library.gradle +++ b/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" diff --git a/instrumentation/aws-sdk/aws-sdk-2.2/testing/aws-sdk-2.2-testing.gradle b/instrumentation/aws-sdk/aws-sdk-2.2/testing/aws-sdk-2.2-testing.gradle index 93c2e6ff99..4c0ae2a755 100644 --- a/instrumentation/aws-sdk/aws-sdk-2.2/testing/aws-sdk-2.2-testing.gradle +++ b/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') diff --git a/instrumentation/cassandra/cassandra-3.0/javaagent/cassandra-3.0-javaagent.gradle b/instrumentation/cassandra/cassandra-3.0/javaagent/cassandra-3.0-javaagent.gradle index 6a111b127a..0d7b5eb1d1 100644 --- a/instrumentation/cassandra/cassandra-3.0/javaagent/cassandra-3.0-javaagent.gradle +++ b/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 { diff --git a/instrumentation/cassandra/cassandra-4.0/javaagent/cassandra-4.0-javaagent.gradle b/instrumentation/cassandra/cassandra-4.0/javaagent/cassandra-4.0-javaagent.gradle index bc8c3272cd..5e19dc2e37 100644 --- a/instrumentation/cassandra/cassandra-4.0/javaagent/cassandra-4.0-javaagent.gradle +++ b/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 { diff --git a/instrumentation/couchbase/couchbase-2.0/javaagent-unit-tests/couchbase-2.0-javaagent-unittests.gradle b/instrumentation/couchbase/couchbase-2.0/javaagent-unit-tests/couchbase-2.0-javaagent-unittests.gradle index c108287356..201c7bad15 100644 --- a/instrumentation/couchbase/couchbase-2.0/javaagent-unit-tests/couchbase-2.0-javaagent-unittests.gradle +++ b/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" diff --git a/instrumentation/couchbase/couchbase-2.0/javaagent/couchbase-2.0-javaagent.gradle b/instrumentation/couchbase/couchbase-2.0/javaagent/couchbase-2.0-javaagent.gradle index 5dff68bb7f..839fce0c3a 100644 --- a/instrumentation/couchbase/couchbase-2.0/javaagent/couchbase-2.0-javaagent.gradle +++ b/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. diff --git a/instrumentation/couchbase/couchbase-2.6/javaagent/couchbase-2.6-javaagent.gradle b/instrumentation/couchbase/couchbase-2.6/javaagent/couchbase-2.6-javaagent.gradle index f5d66b0c5f..d93d93186e 100644 --- a/instrumentation/couchbase/couchbase-2.6/javaagent/couchbase-2.6-javaagent.gradle +++ b/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 { diff --git a/instrumentation/couchbase/couchbase-3.1.6/javaagent/couchbase-3.1.6-javaagent.gradle b/instrumentation/couchbase/couchbase-3.1.6/javaagent/couchbase-3.1.6-javaagent.gradle index a7cdd679f8..b75c700836 100644 --- a/instrumentation/couchbase/couchbase-3.1.6/javaagent/couchbase-3.1.6-javaagent.gradle +++ b/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 { diff --git a/instrumentation/couchbase/couchbase-3.1/javaagent/couchbase-3.1-javaagent.gradle b/instrumentation/couchbase/couchbase-3.1/javaagent/couchbase-3.1-javaagent.gradle index 4319a7c9a7..58c91bd440 100644 --- a/instrumentation/couchbase/couchbase-3.1/javaagent/couchbase-3.1-javaagent.gradle +++ b/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 { diff --git a/instrumentation/couchbase/couchbase-testing/couchbase-testing.gradle b/instrumentation/couchbase/couchbase-testing/couchbase-testing.gradle index c4aaec8076..24a32ab34f 100644 --- a/instrumentation/couchbase/couchbase-testing/couchbase-testing.gradle +++ b/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') diff --git a/instrumentation/dropwizard-views-0.7/javaagent/dropwizard-views-0.7-javaagent.gradle b/instrumentation/dropwizard-views-0.7/javaagent/dropwizard-views-0.7-javaagent.gradle index 84dcfa3e7a..ac4fd353b6 100644 --- a/instrumentation/dropwizard-views-0.7/javaagent/dropwizard-views-0.7-javaagent.gradle +++ b/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 { diff --git a/instrumentation/elasticsearch/elasticsearch-rest-5.0/javaagent/elasticsearch-rest-5.0-javaagent.gradle b/instrumentation/elasticsearch/elasticsearch-rest-5.0/javaagent/elasticsearch-rest-5.0-javaagent.gradle index 5adf1f7694..a686b3a247 100644 --- a/instrumentation/elasticsearch/elasticsearch-rest-5.0/javaagent/elasticsearch-rest-5.0-javaagent.gradle +++ b/instrumentation/elasticsearch/elasticsearch-rest-5.0/javaagent/elasticsearch-rest-5.0-javaagent.gradle @@ -1,5 +1,7 @@ -apply plugin: "otel.javaagent-instrumentation" -apply plugin: 'org.unbroken-dome.test-sets' +plugins { + id("otel.javaagent-instrumentation") + id("org.unbroken-dome.test-sets") +} muzzle { pass { diff --git a/instrumentation/elasticsearch/elasticsearch-rest-6.4/javaagent/elasticsearch-rest-6.4-javaagent.gradle b/instrumentation/elasticsearch/elasticsearch-rest-6.4/javaagent/elasticsearch-rest-6.4-javaagent.gradle index 3233b64351..cdc18b671e 100644 --- a/instrumentation/elasticsearch/elasticsearch-rest-6.4/javaagent/elasticsearch-rest-6.4-javaagent.gradle +++ b/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 { diff --git a/instrumentation/elasticsearch/elasticsearch-rest-7.0/javaagent/elasticsearch-rest-7.0-javaagent.gradle b/instrumentation/elasticsearch/elasticsearch-rest-7.0/javaagent/elasticsearch-rest-7.0-javaagent.gradle index ca43d965b2..7173bac896 100644 --- a/instrumentation/elasticsearch/elasticsearch-rest-7.0/javaagent/elasticsearch-rest-7.0-javaagent.gradle +++ b/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 { diff --git a/instrumentation/elasticsearch/elasticsearch-rest-common/library/elasticsearch-rest-common-library.gradle b/instrumentation/elasticsearch/elasticsearch-rest-common/library/elasticsearch-rest-common-library.gradle index 72ed7a1af9..b52a20756e 100644 --- a/instrumentation/elasticsearch/elasticsearch-rest-common/library/elasticsearch-rest-common-library.gradle +++ b/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" diff --git a/instrumentation/elasticsearch/elasticsearch-transport-5.0/javaagent/elasticsearch-transport-5.0-javaagent.gradle b/instrumentation/elasticsearch/elasticsearch-transport-5.0/javaagent/elasticsearch-transport-5.0-javaagent.gradle index 26f1dcdd64..8048b53586 100644 --- a/instrumentation/elasticsearch/elasticsearch-transport-5.0/javaagent/elasticsearch-transport-5.0-javaagent.gradle +++ b/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 { diff --git a/instrumentation/elasticsearch/elasticsearch-transport-5.3/javaagent/elasticsearch-transport-5.3-javaagent.gradle b/instrumentation/elasticsearch/elasticsearch-transport-5.3/javaagent/elasticsearch-transport-5.3-javaagent.gradle index 67dda7b487..33d66b59c2 100644 --- a/instrumentation/elasticsearch/elasticsearch-transport-5.3/javaagent/elasticsearch-transport-5.3-javaagent.gradle +++ b/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 { diff --git a/instrumentation/elasticsearch/elasticsearch-transport-6.0/javaagent/elasticsearch-transport-6.0-javaagent.gradle b/instrumentation/elasticsearch/elasticsearch-transport-6.0/javaagent/elasticsearch-transport-6.0-javaagent.gradle index 106111adc1..ac8ef3b952 100644 --- a/instrumentation/elasticsearch/elasticsearch-transport-6.0/javaagent/elasticsearch-transport-6.0-javaagent.gradle +++ b/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 { diff --git a/instrumentation/elasticsearch/elasticsearch-transport-common/library/elasticsearch-transport-common-library.gradle b/instrumentation/elasticsearch/elasticsearch-transport-common/library/elasticsearch-transport-common-library.gradle index cc8517d77c..2f036599b5 100644 --- a/instrumentation/elasticsearch/elasticsearch-transport-common/library/elasticsearch-transport-common-library.gradle +++ b/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. \ No newline at end of file diff --git a/instrumentation/executors/javaagent/executors-javaagent.gradle b/instrumentation/executors/javaagent/executors-javaagent.gradle index 3a8759ad3a..05e0d9d920 100644 --- a/instrumentation/executors/javaagent/executors-javaagent.gradle +++ b/instrumentation/executors/javaagent/executors-javaagent.gradle @@ -1,4 +1,6 @@ -apply plugin: "otel.javaagent-instrumentation" +plugins { + id("otel.javaagent-instrumentation") +} muzzle { pass { diff --git a/instrumentation/external-annotations/javaagent-unit-tests/external-annotations-javaagent-unittests.gradle b/instrumentation/external-annotations/javaagent-unit-tests/external-annotations-javaagent-unittests.gradle index ec9f23c982..264629ef3a 100644 --- a/instrumentation/external-annotations/javaagent-unit-tests/external-annotations-javaagent-unittests.gradle +++ b/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') diff --git a/instrumentation/external-annotations/javaagent/external-annotations-javaagent.gradle b/instrumentation/external-annotations/javaagent/external-annotations-javaagent.gradle index 2d0b42b18d..d5aa618783 100644 --- a/instrumentation/external-annotations/javaagent/external-annotations-javaagent.gradle +++ b/instrumentation/external-annotations/javaagent/external-annotations-javaagent.gradle @@ -1,4 +1,6 @@ -apply plugin: "otel.javaagent-instrumentation" +plugins { + id("otel.javaagent-instrumentation") +} muzzle { pass { diff --git a/instrumentation/finatra-2.9/javaagent/finatra-2.9-javaagent.gradle b/instrumentation/finatra-2.9/javaagent/finatra-2.9-javaagent.gradle index 692672bcc3..095758709d 100644 --- a/instrumentation/finatra-2.9/javaagent/finatra-2.9-javaagent.gradle +++ b/instrumentation/finatra-2.9/javaagent/finatra-2.9-javaagent.gradle @@ -1,7 +1,8 @@ -apply plugin: "otel.javaagent-instrumentation" -apply plugin: "otel.scala-conventions" - -apply plugin: 'org.unbroken-dome.test-sets' +plugins { + id("otel.javaagent-instrumentation") + id("otel.scala-conventions") + id("org.unbroken-dome.test-sets") +} testSets { // We need separate test sources to compile against latest Finatra. diff --git a/instrumentation/geode-1.4/javaagent/geode-1.4-javaagent.gradle b/instrumentation/geode-1.4/javaagent/geode-1.4-javaagent.gradle index 2bac291f4e..cf10625cc4 100644 --- a/instrumentation/geode-1.4/javaagent/geode-1.4-javaagent.gradle +++ b/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 { diff --git a/instrumentation/google-http-client-1.19/javaagent/google-http-client-1.19-javaagent.gradle b/instrumentation/google-http-client-1.19/javaagent/google-http-client-1.19-javaagent.gradle index 1b4917b676..454f973029 100644 --- a/instrumentation/google-http-client-1.19/javaagent/google-http-client-1.19-javaagent.gradle +++ b/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 { diff --git a/instrumentation/grails-3.0/javaagent/grails-3.0-javaagent.gradle b/instrumentation/grails-3.0/javaagent/grails-3.0-javaagent.gradle index 7680f86b4e..265d868dbd 100644 --- a/instrumentation/grails-3.0/javaagent/grails-3.0-javaagent.gradle +++ b/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 { diff --git a/instrumentation/grizzly-2.0/javaagent/grizzly-2.0-javaagent.gradle b/instrumentation/grizzly-2.0/javaagent/grizzly-2.0-javaagent.gradle index 373dcbc2ce..e2918335ca 100644 --- a/instrumentation/grizzly-2.0/javaagent/grizzly-2.0-javaagent.gradle +++ b/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 { diff --git a/instrumentation/grpc-1.6/javaagent/grpc-1.6-javaagent.gradle b/instrumentation/grpc-1.6/javaagent/grpc-1.6-javaagent.gradle index d7e63e6b89..53688c7fdf 100644 --- a/instrumentation/grpc-1.6/javaagent/grpc-1.6-javaagent.gradle +++ b/instrumentation/grpc-1.6/javaagent/grpc-1.6-javaagent.gradle @@ -1,20 +1,6 @@ -/* - * Copyright The OpenTelemetry Authors - * - * 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" +plugins { + id("otel.javaagent-instrumentation") +} muzzle { pass { diff --git a/instrumentation/grpc-1.6/library/grpc-1.6-library.gradle b/instrumentation/grpc-1.6/library/grpc-1.6-library.gradle index f58291f99d..d15321fa76 100644 --- a/instrumentation/grpc-1.6/library/grpc-1.6-library.gradle +++ b/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' diff --git a/instrumentation/grpc-1.6/testing/grpc-1.6-testing.gradle b/instrumentation/grpc-1.6/testing/grpc-1.6-testing.gradle index b57ec29e55..d2a70be64b 100644 --- a/instrumentation/grpc-1.6/testing/grpc-1.6-testing.gradle +++ b/instrumentation/grpc-1.6/testing/grpc-1.6-testing.gradle @@ -1,10 +1,8 @@ plugins { - id "java-library" - id "com.google.protobuf" version "0.8.16" + id("otel.java-conventions") + id("com.google.protobuf") version "0.8.16" } -apply plugin: "otel.java-conventions" - def grpcVersion = '1.6.0' protobuf { diff --git a/instrumentation/guava-10.0/javaagent/guava-10.0-javaagent.gradle b/instrumentation/guava-10.0/javaagent/guava-10.0-javaagent.gradle index a1a9c8634d..53475ef5e4 100644 --- a/instrumentation/guava-10.0/javaagent/guava-10.0-javaagent.gradle +++ b/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 { diff --git a/instrumentation/guava-10.0/library/guava-10.0-library.gradle b/instrumentation/guava-10.0/library/guava-10.0-library.gradle index 59e36017aa..35ec300e33 100644 --- a/instrumentation/guava-10.0/library/guava-10.0-library.gradle +++ b/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" diff --git a/instrumentation/gwt-2.0/javaagent/gwt-2.0-javaagent.gradle b/instrumentation/gwt-2.0/javaagent/gwt-2.0-javaagent.gradle index e4f88a1729..ebd819a2e8 100644 --- a/instrumentation/gwt-2.0/javaagent/gwt-2.0-javaagent.gradle +++ b/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 { diff --git a/instrumentation/hibernate/hibernate-3.3/javaagent/hibernate-3.3-javaagent.gradle b/instrumentation/hibernate/hibernate-3.3/javaagent/hibernate-3.3-javaagent.gradle index 56f2eaedea..28d45c370b 100644 --- a/instrumentation/hibernate/hibernate-3.3/javaagent/hibernate-3.3-javaagent.gradle +++ b/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 { diff --git a/instrumentation/hibernate/hibernate-4.0/javaagent/hibernate-4.0-javaagent.gradle b/instrumentation/hibernate/hibernate-4.0/javaagent/hibernate-4.0-javaagent.gradle index 946c69cebe..8706c34708 100644 --- a/instrumentation/hibernate/hibernate-4.0/javaagent/hibernate-4.0-javaagent.gradle +++ b/instrumentation/hibernate/hibernate-4.0/javaagent/hibernate-4.0-javaagent.gradle @@ -1,5 +1,7 @@ -apply plugin: "otel.javaagent-instrumentation" -apply plugin: 'org.unbroken-dome.test-sets' +plugins { + id("otel.javaagent-instrumentation") + id("org.unbroken-dome.test-sets") +} muzzle { pass { diff --git a/instrumentation/hibernate/hibernate-common/javaagent/hibernate-common-javaagent.gradle b/instrumentation/hibernate/hibernate-common/javaagent/hibernate-common-javaagent.gradle index e6a518bdc7..02b45b12fe 100644 --- a/instrumentation/hibernate/hibernate-common/javaagent/hibernate-common-javaagent.gradle +++ b/instrumentation/hibernate/hibernate-common/javaagent/hibernate-common-javaagent.gradle @@ -1,8 +1,9 @@ /* * Classes that are common to all versions of the Hibernate instrumentation. */ - -apply plugin: "otel.library-instrumentation" +plugins { + id("otel.library-instrumentation") +} dependencies { compileOnly project(':javaagent-api') diff --git a/instrumentation/hibernate/hibernate-procedure-call-4.3/javaagent/hibernate-procedure-call-4.3-javaagent.gradle b/instrumentation/hibernate/hibernate-procedure-call-4.3/javaagent/hibernate-procedure-call-4.3-javaagent.gradle index 8b45ef729a..27d0c157eb 100644 --- a/instrumentation/hibernate/hibernate-procedure-call-4.3/javaagent/hibernate-procedure-call-4.3-javaagent.gradle +++ b/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 { diff --git a/instrumentation/http-url-connection/javaagent/http-url-connection-javaagent.gradle b/instrumentation/http-url-connection/javaagent/http-url-connection-javaagent.gradle index 033cf15e98..c6edc22278 100644 --- a/instrumentation/http-url-connection/javaagent/http-url-connection-javaagent.gradle +++ b/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 { diff --git a/instrumentation/hystrix-1.4/javaagent/hystrix-1.4-javaagent.gradle b/instrumentation/hystrix-1.4/javaagent/hystrix-1.4-javaagent.gradle index b8430c7fe1..08fbc2d72d 100644 --- a/instrumentation/hystrix-1.4/javaagent/hystrix-1.4-javaagent.gradle +++ b/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 { diff --git a/instrumentation/instrumentation.gradle b/instrumentation/instrumentation.gradle index f115b22a6d..eb3e6d70bf 100644 --- a/instrumentation/instrumentation.gradle +++ b/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 { diff --git a/instrumentation/internal/internal-class-loader/javaagent/internal-class-loader-javaagent.gradle b/instrumentation/internal/internal-class-loader/javaagent/internal-class-loader-javaagent.gradle index 8e7a0a5209..03a2ca834c 100644 --- a/instrumentation/internal/internal-class-loader/javaagent/internal-class-loader-javaagent.gradle +++ b/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') diff --git a/instrumentation/internal/internal-eclipse-osgi-3.6/javaagent/internal-eclipse-osgi-3.6-javaagent.gradle b/instrumentation/internal/internal-eclipse-osgi-3.6/javaagent/internal-eclipse-osgi-3.6-javaagent.gradle index 0cfd1c4f8c..3ba12aca15 100644 --- a/instrumentation/internal/internal-eclipse-osgi-3.6/javaagent/internal-eclipse-osgi-3.6-javaagent.gradle +++ b/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): diff --git a/instrumentation/internal/internal-proxy/javaagent-unit-tests/internal-proxy-javaagent-unit-tests.gradle b/instrumentation/internal/internal-proxy/javaagent-unit-tests/internal-proxy-javaagent-unit-tests.gradle index 83c781ec66..716399cf42 100644 --- a/instrumentation/internal/internal-proxy/javaagent-unit-tests/internal-proxy-javaagent-unit-tests.gradle +++ b/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') diff --git a/instrumentation/internal/internal-proxy/javaagent/internal-proxy-javaagent.gradle b/instrumentation/internal/internal-proxy/javaagent/internal-proxy-javaagent.gradle index ec7ae4ba49..f0e4d203b3 100644 --- a/instrumentation/internal/internal-proxy/javaagent/internal-proxy-javaagent.gradle +++ b/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') diff --git a/instrumentation/internal/internal-url-class-loader/javaagent-integration-tests/internal-url-class-loader-javaagent-integration-tests.gradle b/instrumentation/internal/internal-url-class-loader/javaagent-integration-tests/internal-url-class-loader-javaagent-integration-tests.gradle index 71b3d463df..9e301d5904 100644 --- a/instrumentation/internal/internal-url-class-loader/javaagent-integration-tests/internal-url-class-loader-javaagent-integration-tests.gradle +++ b/instrumentation/internal/internal-url-class-loader/javaagent-integration-tests/internal-url-class-loader-javaagent-integration-tests.gradle @@ -1,6 +1,6 @@ -ext.skipPublish = true - -apply plugin: "otel.javaagent-instrumentation" +plugins { + id("otel.javaagent-testing") +} dependencies { testImplementation "org.apache.commons:commons-lang3:3.12.0" diff --git a/instrumentation/internal/internal-url-class-loader/javaagent/internal-url-class-loader-javaagent.gradle b/instrumentation/internal/internal-url-class-loader/javaagent/internal-url-class-loader-javaagent.gradle index 5c890ece9a..0b6bd5f679 100644 --- a/instrumentation/internal/internal-url-class-loader/javaagent/internal-url-class-loader-javaagent.gradle +++ b/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") +} diff --git a/instrumentation/java-http-client/javaagent/java-http-client-javaagent.gradle b/instrumentation/java-http-client/javaagent/java-http-client-javaagent.gradle index fb9e29c141..f43bc7c6e5 100644 --- a/instrumentation/java-http-client/javaagent/java-http-client-javaagent.gradle +++ b/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 { diff --git a/instrumentation/jaxrs-client/jaxrs-client-1.1/javaagent/jaxrs-client-1.1-javaagent.gradle b/instrumentation/jaxrs-client/jaxrs-client-1.1/javaagent/jaxrs-client-1.1-javaagent.gradle index cae3d9f0a7..eedfd4257c 100644 --- a/instrumentation/jaxrs-client/jaxrs-client-1.1/javaagent/jaxrs-client-1.1-javaagent.gradle +++ b/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 { diff --git a/instrumentation/jaxrs-client/jaxrs-client-2.0/jaxrs-client-2.0-common/javaagent/jaxrs-client-2.0-common-javaagent.gradle b/instrumentation/jaxrs-client/jaxrs-client-2.0/jaxrs-client-2.0-common/javaagent/jaxrs-client-2.0-common-javaagent.gradle index 188bd999bd..0fd9e7e263 100644 --- a/instrumentation/jaxrs-client/jaxrs-client-2.0/jaxrs-client-2.0-common/javaagent/jaxrs-client-2.0-common-javaagent.gradle +++ b/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 { diff --git a/instrumentation/jaxrs-client/jaxrs-client-2.0/jaxrs-client-2.0-cxf-3.0/javaagent/jaxrs-client-2.0-cxf-3.0-javaagent.gradle b/instrumentation/jaxrs-client/jaxrs-client-2.0/jaxrs-client-2.0-cxf-3.0/javaagent/jaxrs-client-2.0-cxf-3.0-javaagent.gradle index 3626485c47..66b732a4dd 100644 --- a/instrumentation/jaxrs-client/jaxrs-client-2.0/jaxrs-client-2.0-cxf-3.0/javaagent/jaxrs-client-2.0-cxf-3.0-javaagent.gradle +++ b/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 { diff --git a/instrumentation/jaxrs-client/jaxrs-client-2.0/jaxrs-client-2.0-jersey-2.0/javaagent/jaxrs-client-2.0-jersey-2.0-javaagent.gradle b/instrumentation/jaxrs-client/jaxrs-client-2.0/jaxrs-client-2.0-jersey-2.0/javaagent/jaxrs-client-2.0-jersey-2.0-javaagent.gradle index bc654f3b88..ac1201770d 100644 --- a/instrumentation/jaxrs-client/jaxrs-client-2.0/jaxrs-client-2.0-jersey-2.0/javaagent/jaxrs-client-2.0-jersey-2.0-javaagent.gradle +++ b/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 { diff --git a/instrumentation/jaxrs-client/jaxrs-client-2.0/jaxrs-client-2.0-resteasy-3.0/javaagent/jaxrs-client-2.0-resteasy-3.0-javaagent.gradle b/instrumentation/jaxrs-client/jaxrs-client-2.0/jaxrs-client-2.0-resteasy-3.0/javaagent/jaxrs-client-2.0-resteasy-3.0-javaagent.gradle index ce3d6bd9e6..3d9062becc 100644 --- a/instrumentation/jaxrs-client/jaxrs-client-2.0/jaxrs-client-2.0-resteasy-3.0/javaagent/jaxrs-client-2.0-resteasy-3.0-javaagent.gradle +++ b/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 { diff --git a/instrumentation/jaxrs/jaxrs-1.0/javaagent/jaxrs-1.0-javaagent.gradle b/instrumentation/jaxrs/jaxrs-1.0/javaagent/jaxrs-1.0-javaagent.gradle index e96653464f..3461c9b5ae 100644 --- a/instrumentation/jaxrs/jaxrs-1.0/javaagent/jaxrs-1.0-javaagent.gradle +++ b/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 { diff --git a/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-common/javaagent/jaxrs-2.0-common-javaagent.gradle b/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-common/javaagent/jaxrs-2.0-common-javaagent.gradle index a1d61945d7..8d874f65e1 100644 --- a/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-common/javaagent/jaxrs-2.0-common-javaagent.gradle +++ b/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 { diff --git a/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-cxf-3.2/javaagent/jaxrs-2.0-cxf-3.2-javaagent.gradle b/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-cxf-3.2/javaagent/jaxrs-2.0-cxf-3.2-javaagent.gradle index af76794425..74f11cb674 100644 --- a/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-cxf-3.2/javaagent/jaxrs-2.0-cxf-3.2-javaagent.gradle +++ b/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 diff --git a/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-jersey-2.0/javaagent/jaxrs-2.0-jersey-2.0-javaagent.gradle b/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-jersey-2.0/javaagent/jaxrs-2.0-jersey-2.0-javaagent.gradle index 368a29fe14..a96d5954da 100644 --- a/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-jersey-2.0/javaagent/jaxrs-2.0-jersey-2.0-javaagent.gradle +++ b/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 diff --git a/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-resteasy-3.0/javaagent/jaxrs-2.0-resteasy-3.0-javaagent.gradle b/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-resteasy-3.0/javaagent/jaxrs-2.0-resteasy-3.0-javaagent.gradle index 05751a40f6..e73e5d64d7 100644 --- a/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-resteasy-3.0/javaagent/jaxrs-2.0-resteasy-3.0-javaagent.gradle +++ b/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 diff --git a/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-resteasy-3.1/javaagent/jaxrs-2.0-resteasy-3.1-javaagent.gradle b/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-resteasy-3.1/javaagent/jaxrs-2.0-resteasy-3.1-javaagent.gradle index 40552adf97..b28e552b51 100644 --- a/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-resteasy-3.1/javaagent/jaxrs-2.0-resteasy-3.1-javaagent.gradle +++ b/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 diff --git a/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-resteasy-common/javaagent/jaxrs-2.0-resteasy-common-javaagent.gradle b/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-resteasy-common/javaagent/jaxrs-2.0-resteasy-common-javaagent.gradle index 6b9a9aab3f..3209e2da96 100644 --- a/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-resteasy-common/javaagent/jaxrs-2.0-resteasy-common-javaagent.gradle +++ b/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" diff --git a/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-testing/jaxrs-2.0-testing.gradle b/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-testing/jaxrs-2.0-testing.gradle index a4edd120ef..8125aa0c18 100644 --- a/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-testing/jaxrs-2.0-testing.gradle +++ b/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') diff --git a/instrumentation/jaxws/jaxws-2.0-axis2-1.6/javaagent/jaxws-2.0-axis2-1.6-javaagent.gradle b/instrumentation/jaxws/jaxws-2.0-axis2-1.6/javaagent/jaxws-2.0-axis2-1.6-javaagent.gradle index 02b9f14899..e8f7d1b7a9 100644 --- a/instrumentation/jaxws/jaxws-2.0-axis2-1.6/javaagent/jaxws-2.0-axis2-1.6-javaagent.gradle +++ b/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 { diff --git a/instrumentation/jaxws/jaxws-2.0-axis2-1.6/library/jaxws-2.0-axis2-1.6-library.gradle b/instrumentation/jaxws/jaxws-2.0-axis2-1.6/library/jaxws-2.0-axis2-1.6-library.gradle index a19aa9d2d8..330824be74 100644 --- a/instrumentation/jaxws/jaxws-2.0-axis2-1.6/library/jaxws-2.0-axis2-1.6-library.gradle +++ b/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" diff --git a/instrumentation/jaxws/jaxws-2.0-cxf-3.0/javaagent/jaxws-2.0-cxf-3.0-javaagent.gradle b/instrumentation/jaxws/jaxws-2.0-cxf-3.0/javaagent/jaxws-2.0-cxf-3.0-javaagent.gradle index 4617a9be15..116de618cd 100644 --- a/instrumentation/jaxws/jaxws-2.0-cxf-3.0/javaagent/jaxws-2.0-cxf-3.0-javaagent.gradle +++ b/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 { diff --git a/instrumentation/jaxws/jaxws-2.0-cxf-3.0/library/jaxws-2.0-cxf-3.0-library.gradle b/instrumentation/jaxws/jaxws-2.0-cxf-3.0/library/jaxws-2.0-cxf-3.0-library.gradle index e2be94692a..e92c9c344c 100644 --- a/instrumentation/jaxws/jaxws-2.0-cxf-3.0/library/jaxws-2.0-cxf-3.0-library.gradle +++ b/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" diff --git a/instrumentation/jaxws/jaxws-2.0-metro-2.2/javaagent/jaxws-2.0-metro-2.2-javaagent.gradle b/instrumentation/jaxws/jaxws-2.0-metro-2.2/javaagent/jaxws-2.0-metro-2.2-javaagent.gradle index 717ae86df6..54b91f26c6 100644 --- a/instrumentation/jaxws/jaxws-2.0-metro-2.2/javaagent/jaxws-2.0-metro-2.2-javaagent.gradle +++ b/instrumentation/jaxws/jaxws-2.0-metro-2.2/javaagent/jaxws-2.0-metro-2.2-javaagent.gradle @@ -1,4 +1,6 @@ -apply plugin: "otel.javaagent-instrumentation" +plugins { + id("otel.javaagent-instrumentation") +} muzzle { pass { diff --git a/instrumentation/jaxws/jaxws-2.0-testing/jaxws-2.0-testing.gradle b/instrumentation/jaxws/jaxws-2.0-testing/jaxws-2.0-testing.gradle index c0b4d78692..d786b2e045 100644 --- a/instrumentation/jaxws/jaxws-2.0-testing/jaxws-2.0-testing.gradle +++ b/instrumentation/jaxws/jaxws-2.0-testing/jaxws-2.0-testing.gradle @@ -1,9 +1,8 @@ plugins { id "org.unbroken-dome.xjc" version "2.0.0" + id("otel.java-conventions") } -apply plugin: "otel.java-conventions" - checkstyle { // exclude generated web service classes checkstyleMain.exclude "**/hello_web_service/**" diff --git a/instrumentation/jaxws/jaxws-2.0/javaagent/jaxws-2.0-javaagent.gradle b/instrumentation/jaxws/jaxws-2.0/javaagent/jaxws-2.0-javaagent.gradle index a1919c9bef..78b13522bb 100644 --- a/instrumentation/jaxws/jaxws-2.0/javaagent/jaxws-2.0-javaagent.gradle +++ b/instrumentation/jaxws/jaxws-2.0/javaagent/jaxws-2.0-javaagent.gradle @@ -1,4 +1,6 @@ -apply plugin: "otel.javaagent-instrumentation" +plugins { + id("otel.javaagent-instrumentation") +} muzzle { pass { diff --git a/instrumentation/jaxws/jws-1.1/javaagent/jws-1.1-javaagent.gradle b/instrumentation/jaxws/jws-1.1/javaagent/jws-1.1-javaagent.gradle index a1151eb5f3..e8d6e02f7f 100644 --- a/instrumentation/jaxws/jws-1.1/javaagent/jws-1.1-javaagent.gradle +++ b/instrumentation/jaxws/jws-1.1/javaagent/jws-1.1-javaagent.gradle @@ -1,4 +1,6 @@ -apply plugin: "otel.javaagent-instrumentation" +plugins { + id("otel.javaagent-instrumentation") +} muzzle { pass { diff --git a/instrumentation/jdbc/javaagent-unit-tests/jdbc-javaagent-unit-tests.gradle b/instrumentation/jdbc/javaagent-unit-tests/jdbc-javaagent-unit-tests.gradle index a3436089d9..be810602b0 100644 --- a/instrumentation/jdbc/javaagent-unit-tests/jdbc-javaagent-unit-tests.gradle +++ b/instrumentation/jdbc/javaagent-unit-tests/jdbc-javaagent-unit-tests.gradle @@ -1,4 +1,6 @@ -apply plugin: "otel.java-conventions" +plugins { + id("otel.java-conventions") +} dependencies { testImplementation project(':instrumentation:jdbc:javaagent') diff --git a/instrumentation/jdbc/javaagent/jdbc-javaagent.gradle b/instrumentation/jdbc/javaagent/jdbc-javaagent.gradle index c0cb82ecb3..bb0c2dde47 100644 --- a/instrumentation/jdbc/javaagent/jdbc-javaagent.gradle +++ b/instrumentation/jdbc/javaagent/jdbc-javaagent.gradle @@ -1,4 +1,6 @@ -apply plugin: "otel.javaagent-instrumentation" +plugins { + id("otel.javaagent-instrumentation") +} muzzle { pass { diff --git a/instrumentation/jedis/jedis-1.4/javaagent/jedis-1.4-javaagent.gradle b/instrumentation/jedis/jedis-1.4/javaagent/jedis-1.4-javaagent.gradle index e83da09aaf..44973ab96e 100644 --- a/instrumentation/jedis/jedis-1.4/javaagent/jedis-1.4-javaagent.gradle +++ b/instrumentation/jedis/jedis-1.4/javaagent/jedis-1.4-javaagent.gradle @@ -1,4 +1,6 @@ -apply plugin: "otel.javaagent-instrumentation" +plugins { + id("otel.javaagent-instrumentation") +} muzzle { pass { diff --git a/instrumentation/jedis/jedis-3.0/javaagent/jedis-3.0-javaagent.gradle b/instrumentation/jedis/jedis-3.0/javaagent/jedis-3.0-javaagent.gradle index 2429a58b67..0c28e732e2 100644 --- a/instrumentation/jedis/jedis-3.0/javaagent/jedis-3.0-javaagent.gradle +++ b/instrumentation/jedis/jedis-3.0/javaagent/jedis-3.0-javaagent.gradle @@ -1,4 +1,6 @@ -apply plugin: "otel.javaagent-instrumentation" +plugins { + id("otel.javaagent-instrumentation") +} muzzle { fail { diff --git a/instrumentation/jetty/jetty-11.0/javaagent/jetty-11.0-javaagent.gradle b/instrumentation/jetty/jetty-11.0/javaagent/jetty-11.0-javaagent.gradle index 1c7693296d..a019e13ab7 100644 --- a/instrumentation/jetty/jetty-11.0/javaagent/jetty-11.0-javaagent.gradle +++ b/instrumentation/jetty/jetty-11.0/javaagent/jetty-11.0-javaagent.gradle @@ -1,4 +1,6 @@ -apply plugin: "otel.javaagent-instrumentation" +plugins { + id("otel.javaagent-instrumentation") +} muzzle { pass { diff --git a/instrumentation/jetty/jetty-8.0/javaagent/jetty-8.0-javaagent.gradle b/instrumentation/jetty/jetty-8.0/javaagent/jetty-8.0-javaagent.gradle index 6ff2b45571..7cd4508acf 100644 --- a/instrumentation/jetty/jetty-8.0/javaagent/jetty-8.0-javaagent.gradle +++ b/instrumentation/jetty/jetty-8.0/javaagent/jetty-8.0-javaagent.gradle @@ -1,4 +1,6 @@ -apply plugin: "otel.javaagent-instrumentation" +plugins { + id("otel.javaagent-instrumentation") +} muzzle { pass { diff --git a/instrumentation/jetty/jetty-common/javaagent/jetty-common-javaagent.gradle b/instrumentation/jetty/jetty-common/javaagent/jetty-common-javaagent.gradle index bab35fd53b..5927dfa36d 100644 --- a/instrumentation/jetty/jetty-common/javaagent/jetty-common-javaagent.gradle +++ b/instrumentation/jetty/jetty-common/javaagent/jetty-common-javaagent.gradle @@ -1,4 +1,6 @@ -apply plugin: "otel.javaagent-instrumentation" +plugins { + id("otel.javaagent-instrumentation") +} dependencies { api(project(':instrumentation:servlet:servlet-common:library')) diff --git a/instrumentation/jms-1.1/javaagent-unit-tests/jms-1.1-javaagent-unit-tests.gradle b/instrumentation/jms-1.1/javaagent-unit-tests/jms-1.1-javaagent-unit-tests.gradle index 4ced74b6cd..06319c3198 100644 --- a/instrumentation/jms-1.1/javaagent-unit-tests/jms-1.1-javaagent-unit-tests.gradle +++ b/instrumentation/jms-1.1/javaagent-unit-tests/jms-1.1-javaagent-unit-tests.gradle @@ -1,4 +1,6 @@ -apply plugin: "otel.java-conventions" +plugins { + id("otel.java-conventions") +} dependencies { testImplementation "javax.jms:jms-api:1.1-rev-1" diff --git a/instrumentation/jms-1.1/javaagent/jms-1.1-javaagent.gradle b/instrumentation/jms-1.1/javaagent/jms-1.1-javaagent.gradle index c4536ab88d..151eb2d330 100644 --- a/instrumentation/jms-1.1/javaagent/jms-1.1-javaagent.gradle +++ b/instrumentation/jms-1.1/javaagent/jms-1.1-javaagent.gradle @@ -1,5 +1,7 @@ -apply plugin: "otel.javaagent-instrumentation" -apply plugin: 'org.unbroken-dome.test-sets' +plugins { + id("otel.javaagent-instrumentation") + id("org.unbroken-dome.test-sets") +} muzzle { pass { diff --git a/instrumentation/jsf/jsf-common/library/jsf-common-library.gradle b/instrumentation/jsf/jsf-common/library/jsf-common-library.gradle index 65c3fbf369..57eb3c71ed 100644 --- a/instrumentation/jsf/jsf-common/library/jsf-common-library.gradle +++ b/instrumentation/jsf/jsf-common/library/jsf-common-library.gradle @@ -1,4 +1,6 @@ -apply plugin: "otel.library-instrumentation" +plugins { + id("otel.library-instrumentation") +} dependencies { compileOnly "jakarta.faces:jakarta.faces-api:2.3.2" diff --git a/instrumentation/jsf/jsf-testing-common/jsf-testing-common.gradle b/instrumentation/jsf/jsf-testing-common/jsf-testing-common.gradle index e05805aab9..405239ff03 100644 --- a/instrumentation/jsf/jsf-testing-common/jsf-testing-common.gradle +++ b/instrumentation/jsf/jsf-testing-common/jsf-testing-common.gradle @@ -1,4 +1,6 @@ -apply plugin: "otel.java-conventions" +plugins { + id("otel.java-conventions") +} dependencies { api "ch.qos.logback:logback-classic" diff --git a/instrumentation/jsf/mojarra-1.2/javaagent/mojarra-1.2-javaagent.gradle b/instrumentation/jsf/mojarra-1.2/javaagent/mojarra-1.2-javaagent.gradle index b56fade49e..fe844d5998 100644 --- a/instrumentation/jsf/mojarra-1.2/javaagent/mojarra-1.2-javaagent.gradle +++ b/instrumentation/jsf/mojarra-1.2/javaagent/mojarra-1.2-javaagent.gradle @@ -1,5 +1,7 @@ -apply plugin: "otel.javaagent-instrumentation" -apply plugin: 'org.unbroken-dome.test-sets' +plugins { + id("otel.javaagent-instrumentation") + id("org.unbroken-dome.test-sets") +} muzzle { pass { diff --git a/instrumentation/jsf/myfaces-1.2/javaagent/myfaces-1.2-javaagent.gradle b/instrumentation/jsf/myfaces-1.2/javaagent/myfaces-1.2-javaagent.gradle index 90e5fbf5bb..e52dbba014 100644 --- a/instrumentation/jsf/myfaces-1.2/javaagent/myfaces-1.2-javaagent.gradle +++ b/instrumentation/jsf/myfaces-1.2/javaagent/myfaces-1.2-javaagent.gradle @@ -1,5 +1,7 @@ -apply plugin: "otel.javaagent-instrumentation" -apply plugin: 'org.unbroken-dome.test-sets' +plugins { + id("otel.javaagent-instrumentation") + id("org.unbroken-dome.test-sets") +} muzzle { pass { diff --git a/instrumentation/jsp-2.3/javaagent/jsp-2.3-javaagent.gradle b/instrumentation/jsp-2.3/javaagent/jsp-2.3-javaagent.gradle index da13f36bd4..7c96e5f819 100644 --- a/instrumentation/jsp-2.3/javaagent/jsp-2.3-javaagent.gradle +++ b/instrumentation/jsp-2.3/javaagent/jsp-2.3-javaagent.gradle @@ -1,4 +1,6 @@ -apply plugin: "otel.javaagent-instrumentation" +plugins { + id("otel.javaagent-instrumentation") +} muzzle { pass { diff --git a/instrumentation/kafka-clients-0.11/javaagent/kafka-clients-0.11-javaagent.gradle b/instrumentation/kafka-clients-0.11/javaagent/kafka-clients-0.11-javaagent.gradle index 6c2f3c60fd..4368fafce6 100644 --- a/instrumentation/kafka-clients-0.11/javaagent/kafka-clients-0.11-javaagent.gradle +++ b/instrumentation/kafka-clients-0.11/javaagent/kafka-clients-0.11-javaagent.gradle @@ -1,4 +1,6 @@ -apply plugin: "otel.javaagent-instrumentation" +plugins { + id("otel.javaagent-instrumentation") +} muzzle { pass { diff --git a/instrumentation/kafka-streams-0.11/javaagent/kafka-streams-0.11-javaagent.gradle b/instrumentation/kafka-streams-0.11/javaagent/kafka-streams-0.11-javaagent.gradle index 23e0854edb..c6917b0551 100644 --- a/instrumentation/kafka-streams-0.11/javaagent/kafka-streams-0.11-javaagent.gradle +++ b/instrumentation/kafka-streams-0.11/javaagent/kafka-streams-0.11-javaagent.gradle @@ -1,4 +1,6 @@ -apply plugin: "otel.javaagent-instrumentation" +plugins { + id("otel.javaagent-instrumentation") +} muzzle { pass { diff --git a/instrumentation/kotlinx-coroutines/javaagent/kotlinx-coroutines-javaagent.gradle b/instrumentation/kotlinx-coroutines/javaagent/kotlinx-coroutines-javaagent.gradle index 9e4cc85a64..3cbc067f26 100644 --- a/instrumentation/kotlinx-coroutines/javaagent/kotlinx-coroutines-javaagent.gradle +++ b/instrumentation/kotlinx-coroutines/javaagent/kotlinx-coroutines-javaagent.gradle @@ -1,9 +1,8 @@ plugins { - id 'org.jetbrains.kotlin.jvm' + id("org.jetbrains.kotlin.jvm") + id("otel.javaagent-instrumentation") } -apply plugin: "otel.javaagent-instrumentation" - muzzle { pass { group = 'org.jetbrains.kotlinx' diff --git a/instrumentation/kubernetes-client-7.0/javaagent-unit-tests/kubernetes-client-7.0-javaagent-unit-tests.gradle b/instrumentation/kubernetes-client-7.0/javaagent-unit-tests/kubernetes-client-7.0-javaagent-unit-tests.gradle index be04c8dbba..112c3c0f22 100644 --- a/instrumentation/kubernetes-client-7.0/javaagent-unit-tests/kubernetes-client-7.0-javaagent-unit-tests.gradle +++ b/instrumentation/kubernetes-client-7.0/javaagent-unit-tests/kubernetes-client-7.0-javaagent-unit-tests.gradle @@ -1,4 +1,6 @@ -apply plugin: "otel.java-conventions" +plugins { + id("otel.java-conventions") +} dependencies { testImplementation project(':instrumentation:kubernetes-client-7.0:javaagent') diff --git a/instrumentation/kubernetes-client-7.0/javaagent/kubernetes-client-7.0-javaagent.gradle b/instrumentation/kubernetes-client-7.0/javaagent/kubernetes-client-7.0-javaagent.gradle index e5f46477ef..849aba8998 100644 --- a/instrumentation/kubernetes-client-7.0/javaagent/kubernetes-client-7.0-javaagent.gradle +++ b/instrumentation/kubernetes-client-7.0/javaagent/kubernetes-client-7.0-javaagent.gradle @@ -1,4 +1,6 @@ -apply plugin: "otel.javaagent-instrumentation" +plugins { + id("otel.javaagent-instrumentation") +} muzzle { pass { diff --git a/instrumentation/lettuce/lettuce-4.0/javaagent/lettuce-4.0-javaagent.gradle b/instrumentation/lettuce/lettuce-4.0/javaagent/lettuce-4.0-javaagent.gradle index bf2aa51df5..ad638c1b30 100644 --- a/instrumentation/lettuce/lettuce-4.0/javaagent/lettuce-4.0-javaagent.gradle +++ b/instrumentation/lettuce/lettuce-4.0/javaagent/lettuce-4.0-javaagent.gradle @@ -1,4 +1,6 @@ -apply plugin: "otel.javaagent-instrumentation" +plugins { + id("otel.javaagent-instrumentation") +} muzzle { pass { diff --git a/instrumentation/lettuce/lettuce-5.0/javaagent/lettuce-5.0-javaagent.gradle b/instrumentation/lettuce/lettuce-5.0/javaagent/lettuce-5.0-javaagent.gradle index 38a196328f..cf9958e08a 100644 --- a/instrumentation/lettuce/lettuce-5.0/javaagent/lettuce-5.0-javaagent.gradle +++ b/instrumentation/lettuce/lettuce-5.0/javaagent/lettuce-5.0-javaagent.gradle @@ -1,4 +1,6 @@ -apply plugin: "otel.javaagent-instrumentation" +plugins { + id("otel.javaagent-instrumentation") +} muzzle { pass { diff --git a/instrumentation/lettuce/lettuce-5.1/javaagent/lettuce-5.1-javaagent.gradle b/instrumentation/lettuce/lettuce-5.1/javaagent/lettuce-5.1-javaagent.gradle index 86d9c485df..129a0ab884 100644 --- a/instrumentation/lettuce/lettuce-5.1/javaagent/lettuce-5.1-javaagent.gradle +++ b/instrumentation/lettuce/lettuce-5.1/javaagent/lettuce-5.1-javaagent.gradle @@ -1,4 +1,6 @@ -apply plugin: "otel.javaagent-instrumentation" +plugins { + id("otel.javaagent-instrumentation") +} muzzle { pass { diff --git a/instrumentation/lettuce/lettuce-5.1/library/lettuce-5.1-library.gradle b/instrumentation/lettuce/lettuce-5.1/library/lettuce-5.1-library.gradle index 10afb66f31..9640b33f3d 100644 --- a/instrumentation/lettuce/lettuce-5.1/library/lettuce-5.1-library.gradle +++ b/instrumentation/lettuce/lettuce-5.1/library/lettuce-5.1-library.gradle @@ -1,5 +1,7 @@ -apply plugin: "otel.library-instrumentation" -apply plugin: "net.ltgt.nullaway" +plugins { + id("otel.library-instrumentation") + id("net.ltgt.nullaway") +} dependencies { library "io.lettuce:lettuce-core:5.1.0.RELEASE" diff --git a/instrumentation/lettuce/lettuce-5.1/testing/lettuce-5.1-testing.gradle b/instrumentation/lettuce/lettuce-5.1/testing/lettuce-5.1-testing.gradle index 55c3f68ada..e96b6c0146 100644 --- a/instrumentation/lettuce/lettuce-5.1/testing/lettuce-5.1-testing.gradle +++ b/instrumentation/lettuce/lettuce-5.1/testing/lettuce-5.1-testing.gradle @@ -1,4 +1,6 @@ -apply plugin: "otel.java-conventions" +plugins { + id("otel.java-conventions") +} dependencies { api project(':testing-common') diff --git a/instrumentation/lettuce/lettuce-common/library/lettuce-common-library.gradle b/instrumentation/lettuce/lettuce-common/library/lettuce-common-library.gradle index 4936b5e30f..1cfd24470d 100644 --- a/instrumentation/lettuce/lettuce-common/library/lettuce-common-library.gradle +++ b/instrumentation/lettuce/lettuce-common/library/lettuce-common-library.gradle @@ -1,9 +1,3 @@ -// not applying $rootDir/gradle/instrumentation.gradle because that brings running tests with agent -// infrastructure, and this module only wants to run unit tests - -ext.mavenGroupId = 'io.opentelemetry.javaagent.instrumentation' - -apply plugin: "otel.java-conventions" -apply plugin: "otel.publish-conventions" - -archivesBaseName = projectDir.parentFile.name +plugins { + id("otel.library-instrumentation") +} diff --git a/instrumentation/liberty/compile-stub/compile-stub.gradle b/instrumentation/liberty/compile-stub/compile-stub.gradle index b1a8285153..949665d588 100644 --- a/instrumentation/liberty/compile-stub/compile-stub.gradle +++ b/instrumentation/liberty/compile-stub/compile-stub.gradle @@ -1,4 +1,6 @@ -apply plugin: "otel.java-conventions" +plugins { + id("otel.java-conventions") +} // liberty jars are not available as a maven dependency so we provide stripped // down versions of liberty classes that we can use from integration code without diff --git a/instrumentation/liberty/liberty-dispatcher/javaagent/liberty-dispatcher-javaagent.gradle b/instrumentation/liberty/liberty-dispatcher/javaagent/liberty-dispatcher-javaagent.gradle index 936f5b9622..8bc323defb 100644 --- a/instrumentation/liberty/liberty-dispatcher/javaagent/liberty-dispatcher-javaagent.gradle +++ b/instrumentation/liberty/liberty-dispatcher/javaagent/liberty-dispatcher-javaagent.gradle @@ -1,4 +1,6 @@ -apply plugin: "otel.javaagent-instrumentation" +plugins { + id("otel.javaagent-instrumentation") +} // liberty and liberty-dispatcher are loaded into different class loaders // liberty module has access to servlet api while liberty-dispatcher does not diff --git a/instrumentation/liberty/liberty/javaagent/liberty-javaagent.gradle b/instrumentation/liberty/liberty/javaagent/liberty-javaagent.gradle index b38a2d8889..47a7e2f5ed 100644 --- a/instrumentation/liberty/liberty/javaagent/liberty-javaagent.gradle +++ b/instrumentation/liberty/liberty/javaagent/liberty-javaagent.gradle @@ -1,4 +1,6 @@ -apply plugin: "otel.javaagent-instrumentation" +plugins { + id("otel.javaagent-instrumentation") +} // liberty and liberty-dispatcher are loaded into different class loaders // liberty module has access to servlet api while liberty-dispatcher does not diff --git a/instrumentation/log4j/log4j-1.2/javaagent/log4j-1.2-javaagent.gradle b/instrumentation/log4j/log4j-1.2/javaagent/log4j-1.2-javaagent.gradle index 70222b7bc5..2a28392a8f 100644 --- a/instrumentation/log4j/log4j-1.2/javaagent/log4j-1.2-javaagent.gradle +++ b/instrumentation/log4j/log4j-1.2/javaagent/log4j-1.2-javaagent.gradle @@ -1,4 +1,6 @@ -apply plugin: "otel.javaagent-instrumentation" +plugins { + id("otel.javaagent-instrumentation") +} muzzle { pass { diff --git a/instrumentation/log4j/log4j-2-testing/log4j-2-testing.gradle b/instrumentation/log4j/log4j-2-testing/log4j-2-testing.gradle index 48684d6841..769e984756 100644 --- a/instrumentation/log4j/log4j-2-testing/log4j-2-testing.gradle +++ b/instrumentation/log4j/log4j-2-testing/log4j-2-testing.gradle @@ -1,4 +1,6 @@ -apply plugin: "otel.java-conventions" +plugins { + id("otel.java-conventions") +} dependencies { api project(':testing-common') diff --git a/instrumentation/log4j/log4j-2.13.2/javaagent/log4j-2.13.2-javaagent.gradle b/instrumentation/log4j/log4j-2.13.2/javaagent/log4j-2.13.2-javaagent.gradle index 3b0a4a2439..ccef39948e 100644 --- a/instrumentation/log4j/log4j-2.13.2/javaagent/log4j-2.13.2-javaagent.gradle +++ b/instrumentation/log4j/log4j-2.13.2/javaagent/log4j-2.13.2-javaagent.gradle @@ -1,5 +1,7 @@ -apply plugin: "otel.javaagent-instrumentation" -apply plugin: "org.unbroken-dome.test-sets" +plugins { + id("otel.javaagent-instrumentation") + id("org.unbroken-dome.test-sets") +} muzzle { pass { diff --git a/instrumentation/log4j/log4j-2.13.2/library/log4j-2.13.2-library.gradle b/instrumentation/log4j/log4j-2.13.2/library/log4j-2.13.2-library.gradle index 9d41622952..a8359ce858 100644 --- a/instrumentation/log4j/log4j-2.13.2/library/log4j-2.13.2-library.gradle +++ b/instrumentation/log4j/log4j-2.13.2/library/log4j-2.13.2-library.gradle @@ -1,4 +1,6 @@ -apply plugin: "otel.library-instrumentation" +plugins { + id("otel.library-instrumentation") +} dependencies { library "org.apache.logging.log4j:log4j-core:2.13.2" diff --git a/instrumentation/log4j/log4j-2.7/javaagent/log4j-2.7-javaagent.gradle b/instrumentation/log4j/log4j-2.7/javaagent/log4j-2.7-javaagent.gradle index c2d6d606aa..de3b4a3efb 100644 --- a/instrumentation/log4j/log4j-2.7/javaagent/log4j-2.7-javaagent.gradle +++ b/instrumentation/log4j/log4j-2.7/javaagent/log4j-2.7-javaagent.gradle @@ -1,4 +1,6 @@ -apply plugin: "otel.javaagent-instrumentation" +plugins { + id("otel.javaagent-instrumentation") +} muzzle { pass { diff --git a/instrumentation/logback-1.0/javaagent/logback-1.0-javaagent.gradle b/instrumentation/logback-1.0/javaagent/logback-1.0-javaagent.gradle index 5885dccbe1..d6a9da4976 100644 --- a/instrumentation/logback-1.0/javaagent/logback-1.0-javaagent.gradle +++ b/instrumentation/logback-1.0/javaagent/logback-1.0-javaagent.gradle @@ -1,4 +1,6 @@ -apply plugin: "otel.javaagent-instrumentation" +plugins { + id("otel.javaagent-instrumentation") +} muzzle { pass { diff --git a/instrumentation/logback-1.0/library/logback-1.0-library.gradle b/instrumentation/logback-1.0/library/logback-1.0-library.gradle index 32289ac604..5f688c51fa 100644 --- a/instrumentation/logback-1.0/library/logback-1.0-library.gradle +++ b/instrumentation/logback-1.0/library/logback-1.0-library.gradle @@ -1,4 +1,6 @@ -apply plugin: "otel.library-instrumentation" +plugins { + id("otel.library-instrumentation") +} dependencies { library "ch.qos.logback:logback-classic:1.0.0" diff --git a/instrumentation/logback-1.0/testing/logback-1.0-testing.gradle b/instrumentation/logback-1.0/testing/logback-1.0-testing.gradle index 33e6465a39..1d368fc260 100644 --- a/instrumentation/logback-1.0/testing/logback-1.0-testing.gradle +++ b/instrumentation/logback-1.0/testing/logback-1.0-testing.gradle @@ -1,20 +1,6 @@ -/* - * Copyright The OpenTelemetry Authors - * - * 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" +plugins { + id("otel.java-conventions") +} dependencies { compileOnly project(":instrumentation:logback-1.0:library") diff --git a/instrumentation/methods/javaagent/methods-javaagent.gradle b/instrumentation/methods/javaagent/methods-javaagent.gradle index b6c364d5f6..1eb0f38341 100644 --- a/instrumentation/methods/javaagent/methods-javaagent.gradle +++ b/instrumentation/methods/javaagent/methods-javaagent.gradle @@ -1,4 +1,6 @@ -apply plugin: "otel.javaagent-instrumentation" +plugins { + id("otel.javaagent-instrumentation") +} muzzle { pass { diff --git a/instrumentation/mongo/mongo-3.1/javaagent/mongo-3.1-javaagent.gradle b/instrumentation/mongo/mongo-3.1/javaagent/mongo-3.1-javaagent.gradle index 0b718dd27b..ae660d4632 100644 --- a/instrumentation/mongo/mongo-3.1/javaagent/mongo-3.1-javaagent.gradle +++ b/instrumentation/mongo/mongo-3.1/javaagent/mongo-3.1-javaagent.gradle @@ -1,4 +1,6 @@ -apply plugin: "otel.javaagent-instrumentation" +plugins { + id("otel.javaagent-instrumentation") +} muzzle { pass { diff --git a/instrumentation/mongo/mongo-3.1/library/mongo-3.1-library.gradle b/instrumentation/mongo/mongo-3.1/library/mongo-3.1-library.gradle index aaf01f8d49..e988fba106 100644 --- a/instrumentation/mongo/mongo-3.1/library/mongo-3.1-library.gradle +++ b/instrumentation/mongo/mongo-3.1/library/mongo-3.1-library.gradle @@ -1,5 +1,7 @@ -apply plugin: "otel.library-instrumentation" -apply plugin: "net.ltgt.nullaway" +plugins { + id("otel.library-instrumentation") + id("net.ltgt.nullaway") +} dependencies { library "org.mongodb:mongo-java-driver:3.1.0" diff --git a/instrumentation/mongo/mongo-3.1/testing/mongo-3.1-testing.gradle b/instrumentation/mongo/mongo-3.1/testing/mongo-3.1-testing.gradle index 2bca350e99..b97b8928e9 100644 --- a/instrumentation/mongo/mongo-3.1/testing/mongo-3.1-testing.gradle +++ b/instrumentation/mongo/mongo-3.1/testing/mongo-3.1-testing.gradle @@ -1,4 +1,6 @@ -apply plugin: "otel.java-conventions" +plugins { + id("otel.java-conventions") +} dependencies { api project(':instrumentation:mongo:mongo-testing') diff --git a/instrumentation/mongo/mongo-3.7/javaagent/mongo-3.7-javaagent.gradle b/instrumentation/mongo/mongo-3.7/javaagent/mongo-3.7-javaagent.gradle index b1ae6cbd04..c8724c5d72 100644 --- a/instrumentation/mongo/mongo-3.7/javaagent/mongo-3.7-javaagent.gradle +++ b/instrumentation/mongo/mongo-3.7/javaagent/mongo-3.7-javaagent.gradle @@ -1,4 +1,6 @@ -apply plugin: "otel.javaagent-instrumentation" +plugins { + id("otel.javaagent-instrumentation") +} muzzle { pass { diff --git a/instrumentation/mongo/mongo-4.0/javaagent/mongo-4.0-javaagent.gradle b/instrumentation/mongo/mongo-4.0/javaagent/mongo-4.0-javaagent.gradle index aac7d4833a..d032cdbc72 100644 --- a/instrumentation/mongo/mongo-4.0/javaagent/mongo-4.0-javaagent.gradle +++ b/instrumentation/mongo/mongo-4.0/javaagent/mongo-4.0-javaagent.gradle @@ -1,4 +1,6 @@ -apply plugin: "otel.javaagent-instrumentation" +plugins { + id("otel.javaagent-instrumentation") +} muzzle { pass { diff --git a/instrumentation/mongo/mongo-async-3.3/javaagent/mongo-async-3.3-javaagent.gradle b/instrumentation/mongo/mongo-async-3.3/javaagent/mongo-async-3.3-javaagent.gradle index 7e23281090..86895fbbb6 100644 --- a/instrumentation/mongo/mongo-async-3.3/javaagent/mongo-async-3.3-javaagent.gradle +++ b/instrumentation/mongo/mongo-async-3.3/javaagent/mongo-async-3.3-javaagent.gradle @@ -1,4 +1,6 @@ -apply plugin: "otel.javaagent-instrumentation" +plugins { + id("otel.javaagent-instrumentation") +} muzzle { pass { diff --git a/instrumentation/mongo/mongo-testing/mongo-testing.gradle b/instrumentation/mongo/mongo-testing/mongo-testing.gradle index 3840c1e220..2a2feedfa0 100644 --- a/instrumentation/mongo/mongo-testing/mongo-testing.gradle +++ b/instrumentation/mongo/mongo-testing/mongo-testing.gradle @@ -1,4 +1,6 @@ -apply plugin: "otel.java-conventions" +plugins { + id("otel.java-conventions") +} dependencies { api project(':testing-common') diff --git a/instrumentation/netty/netty-3.8/javaagent/netty-3.8-javaagent.gradle b/instrumentation/netty/netty-3.8/javaagent/netty-3.8-javaagent.gradle index 4558241084..c1292e1aca 100644 --- a/instrumentation/netty/netty-3.8/javaagent/netty-3.8-javaagent.gradle +++ b/instrumentation/netty/netty-3.8/javaagent/netty-3.8-javaagent.gradle @@ -1,4 +1,6 @@ -apply plugin: "otel.javaagent-instrumentation" +plugins { + id("otel.javaagent-instrumentation") +} muzzle { pass { diff --git a/instrumentation/netty/netty-4-common/javaagent/netty-4-common-javaagent.gradle b/instrumentation/netty/netty-4-common/javaagent/netty-4-common-javaagent.gradle index 403b74b8f3..6058d86f67 100644 --- a/instrumentation/netty/netty-4-common/javaagent/netty-4-common-javaagent.gradle +++ b/instrumentation/netty/netty-4-common/javaagent/netty-4-common-javaagent.gradle @@ -1,4 +1,6 @@ -apply plugin: "otel.javaagent-instrumentation" +plugins { + id("otel.javaagent-instrumentation") +} dependencies { compileOnly "io.netty:netty-codec-http:4.0.0.Final" diff --git a/instrumentation/netty/netty-4.0/javaagent/netty-4.0-javaagent.gradle b/instrumentation/netty/netty-4.0/javaagent/netty-4.0-javaagent.gradle index 8edded8a1c..a48c1cec9f 100644 --- a/instrumentation/netty/netty-4.0/javaagent/netty-4.0-javaagent.gradle +++ b/instrumentation/netty/netty-4.0/javaagent/netty-4.0-javaagent.gradle @@ -1,4 +1,6 @@ -apply plugin: "otel.javaagent-instrumentation" +plugins { + id("otel.javaagent-instrumentation") +} muzzle { pass { diff --git a/instrumentation/netty/netty-4.1/javaagent/netty-4.1-javaagent.gradle b/instrumentation/netty/netty-4.1/javaagent/netty-4.1-javaagent.gradle index 7e531fe8b9..b6bae2de0a 100644 --- a/instrumentation/netty/netty-4.1/javaagent/netty-4.1-javaagent.gradle +++ b/instrumentation/netty/netty-4.1/javaagent/netty-4.1-javaagent.gradle @@ -1,4 +1,6 @@ -apply plugin: "otel.javaagent-instrumentation" +plugins { + id("otel.javaagent-instrumentation") +} muzzle { pass { diff --git a/instrumentation/netty/netty-4.1/library/netty-4.1-library.gradle b/instrumentation/netty/netty-4.1/library/netty-4.1-library.gradle index ede863f83f..8ae8a3eb35 100644 --- a/instrumentation/netty/netty-4.1/library/netty-4.1-library.gradle +++ b/instrumentation/netty/netty-4.1/library/netty-4.1-library.gradle @@ -1,4 +1,6 @@ -apply plugin: "otel.library-instrumentation" +plugins { + id("otel.library-instrumentation") +} dependencies { compileOnly "io.netty:netty-codec-http:4.1.0.Final" diff --git a/instrumentation/okhttp/okhttp-2.2/javaagent/okhttp-2.2-javaagent.gradle b/instrumentation/okhttp/okhttp-2.2/javaagent/okhttp-2.2-javaagent.gradle index fe6fa2c55a..cfd08148b8 100644 --- a/instrumentation/okhttp/okhttp-2.2/javaagent/okhttp-2.2-javaagent.gradle +++ b/instrumentation/okhttp/okhttp-2.2/javaagent/okhttp-2.2-javaagent.gradle @@ -1,4 +1,6 @@ -apply plugin: "otel.javaagent-instrumentation" +plugins { + id("otel.javaagent-instrumentation") +} /* Note: The Interceptor class for OkHttp was not introduced until 2.2+, so we need to make sure the diff --git a/instrumentation/okhttp/okhttp-3.0/javaagent/okhttp-3.0-javaagent.gradle b/instrumentation/okhttp/okhttp-3.0/javaagent/okhttp-3.0-javaagent.gradle index 565f7457e9..cf19363305 100644 --- a/instrumentation/okhttp/okhttp-3.0/javaagent/okhttp-3.0-javaagent.gradle +++ b/instrumentation/okhttp/okhttp-3.0/javaagent/okhttp-3.0-javaagent.gradle @@ -1,4 +1,6 @@ -apply plugin: "otel.javaagent-instrumentation" +plugins { + id("otel.javaagent-instrumentation") +} muzzle { pass { diff --git a/instrumentation/okhttp/okhttp-3.0/library/okhttp-3.0-library.gradle b/instrumentation/okhttp/okhttp-3.0/library/okhttp-3.0-library.gradle index f311f8a9e5..4da60aed76 100644 --- a/instrumentation/okhttp/okhttp-3.0/library/okhttp-3.0-library.gradle +++ b/instrumentation/okhttp/okhttp-3.0/library/okhttp-3.0-library.gradle @@ -1,5 +1,7 @@ -apply plugin: "otel.library-instrumentation" -apply plugin: "net.ltgt.nullaway" +plugins { + id("otel.library-instrumentation") + id("net.ltgt.nullaway") +} dependencies { library "com.squareup.okhttp3:okhttp:3.0.0" diff --git a/instrumentation/okhttp/okhttp-3.0/testing/okhttp-3.0-testing.gradle b/instrumentation/okhttp/okhttp-3.0/testing/okhttp-3.0-testing.gradle index da8c85dd06..89be2260d4 100644 --- a/instrumentation/okhttp/okhttp-3.0/testing/okhttp-3.0-testing.gradle +++ b/instrumentation/okhttp/okhttp-3.0/testing/okhttp-3.0-testing.gradle @@ -1,4 +1,6 @@ -apply plugin: "otel.java-conventions" +plugins { + id("otel.java-conventions") +} dependencies { api(project(':testing-common')) { diff --git a/instrumentation/opentelemetry-annotations-1.0/javaagent/opentelemetry-annotations-1.0-javaagent.gradle b/instrumentation/opentelemetry-annotations-1.0/javaagent/opentelemetry-annotations-1.0-javaagent.gradle index 05d2e89498..219db84f5a 100644 --- a/instrumentation/opentelemetry-annotations-1.0/javaagent/opentelemetry-annotations-1.0-javaagent.gradle +++ b/instrumentation/opentelemetry-annotations-1.0/javaagent/opentelemetry-annotations-1.0-javaagent.gradle @@ -1,4 +1,6 @@ -apply plugin: "otel.javaagent-instrumentation" +plugins { + id("otel.javaagent-instrumentation") +} dependencies { compileOnly project(':javaagent-tooling') diff --git a/instrumentation/opentelemetry-api-1.0/javaagent/opentelemetry-api-1.0-javaagent.gradle b/instrumentation/opentelemetry-api-1.0/javaagent/opentelemetry-api-1.0-javaagent.gradle index db47f6b402..15fc7c2d12 100644 --- a/instrumentation/opentelemetry-api-1.0/javaagent/opentelemetry-api-1.0-javaagent.gradle +++ b/instrumentation/opentelemetry-api-1.0/javaagent/opentelemetry-api-1.0-javaagent.gradle @@ -1,4 +1,6 @@ -apply plugin: "otel.javaagent-instrumentation" +plugins { + id("otel.javaagent-instrumentation") +} dependencies { // this instrumentation needs to be able to reference both the OpenTelemetry API diff --git a/instrumentation/opentelemetry-api-metrics-1.0/javaagent/opentelemetry-api-metrics-1.0-javaagent.gradle b/instrumentation/opentelemetry-api-metrics-1.0/javaagent/opentelemetry-api-metrics-1.0-javaagent.gradle index de6382e35a..b6a4dfec97 100644 --- a/instrumentation/opentelemetry-api-metrics-1.0/javaagent/opentelemetry-api-metrics-1.0-javaagent.gradle +++ b/instrumentation/opentelemetry-api-metrics-1.0/javaagent/opentelemetry-api-metrics-1.0-javaagent.gradle @@ -1,4 +1,6 @@ -apply plugin: "otel.javaagent-instrumentation" +plugins { + id("otel.javaagent-instrumentation") +} dependencies { // this instrumentation needs to be able to reference both the OpenTelemetry API diff --git a/instrumentation/oshi/javaagent/oshi-javaagent.gradle b/instrumentation/oshi/javaagent/oshi-javaagent.gradle index 6b90927175..ffc6c20150 100644 --- a/instrumentation/oshi/javaagent/oshi-javaagent.gradle +++ b/instrumentation/oshi/javaagent/oshi-javaagent.gradle @@ -1,4 +1,6 @@ -apply plugin: "otel.javaagent-instrumentation" +plugins { + id("otel.javaagent-instrumentation") +} muzzle { pass { diff --git a/instrumentation/oshi/library/oshi-library.gradle b/instrumentation/oshi/library/oshi-library.gradle index 66b6423802..2b292f6b0d 100644 --- a/instrumentation/oshi/library/oshi-library.gradle +++ b/instrumentation/oshi/library/oshi-library.gradle @@ -1,4 +1,6 @@ -apply plugin: "otel.library-instrumentation" +plugins { + id("otel.library-instrumentation") +} dependencies { diff --git a/instrumentation/play-ws/play-ws-1.0/javaagent/play-ws-1.0-javaagent.gradle b/instrumentation/play-ws/play-ws-1.0/javaagent/play-ws-1.0-javaagent.gradle index 69dfc952c3..83b814cdfe 100644 --- a/instrumentation/play-ws/play-ws-1.0/javaagent/play-ws-1.0-javaagent.gradle +++ b/instrumentation/play-ws/play-ws-1.0/javaagent/play-ws-1.0-javaagent.gradle @@ -1,4 +1,6 @@ -apply plugin: "otel.javaagent-instrumentation" +plugins { + id("otel.javaagent-instrumentation") +} muzzle { pass { diff --git a/instrumentation/play-ws/play-ws-2.0/javaagent/play-ws-2.0-javaagent.gradle b/instrumentation/play-ws/play-ws-2.0/javaagent/play-ws-2.0-javaagent.gradle index aa636377fd..6501591cb8 100644 --- a/instrumentation/play-ws/play-ws-2.0/javaagent/play-ws-2.0-javaagent.gradle +++ b/instrumentation/play-ws/play-ws-2.0/javaagent/play-ws-2.0-javaagent.gradle @@ -1,4 +1,6 @@ -apply plugin: "otel.javaagent-instrumentation" +plugins { + id("otel.javaagent-instrumentation") +} muzzle { diff --git a/instrumentation/play-ws/play-ws-2.1/javaagent/play-ws-2.1-javaagent.gradle b/instrumentation/play-ws/play-ws-2.1/javaagent/play-ws-2.1-javaagent.gradle index 19cab0f484..948eedf92c 100644 --- a/instrumentation/play-ws/play-ws-2.1/javaagent/play-ws-2.1-javaagent.gradle +++ b/instrumentation/play-ws/play-ws-2.1/javaagent/play-ws-2.1-javaagent.gradle @@ -1,4 +1,6 @@ -apply plugin: "otel.javaagent-instrumentation" +plugins { + id("otel.javaagent-instrumentation") +} muzzle { diff --git a/instrumentation/play-ws/play-ws-common/javaagent/play-ws-common-javaagent.gradle b/instrumentation/play-ws/play-ws-common/javaagent/play-ws-common-javaagent.gradle index e300bd5338..34ad13e38f 100644 --- a/instrumentation/play-ws/play-ws-common/javaagent/play-ws-common-javaagent.gradle +++ b/instrumentation/play-ws/play-ws-common/javaagent/play-ws-common-javaagent.gradle @@ -1,4 +1,6 @@ -apply plugin: "otel.javaagent-instrumentation" +plugins { + id("otel.javaagent-instrumentation") +} def scalaVersion = '2.12' diff --git a/instrumentation/play-ws/play-ws-testing/play-ws-testing.gradle b/instrumentation/play-ws/play-ws-testing/play-ws-testing.gradle index 26a149d8eb..20446b97d9 100644 --- a/instrumentation/play-ws/play-ws-testing/play-ws-testing.gradle +++ b/instrumentation/play-ws/play-ws-testing/play-ws-testing.gradle @@ -1,4 +1,6 @@ -apply plugin: "otel.java-conventions" +plugins { + id("otel.java-conventions") +} def scalaVersion = '2.12' diff --git a/instrumentation/play/play-2.4/javaagent/play-2.4-javaagent.gradle b/instrumentation/play/play-2.4/javaagent/play-2.4-javaagent.gradle index 055300de5a..72b2ef63d0 100644 --- a/instrumentation/play/play-2.4/javaagent/play-2.4-javaagent.gradle +++ b/instrumentation/play/play-2.4/javaagent/play-2.4-javaagent.gradle @@ -1,4 +1,6 @@ -apply plugin: "otel.javaagent-instrumentation" +plugins { + id("otel.javaagent-instrumentation") +} muzzle { pass { diff --git a/instrumentation/play/play-2.6/javaagent/play-2.6-javaagent.gradle b/instrumentation/play/play-2.6/javaagent/play-2.6-javaagent.gradle index e58fc725b7..e0a6e4ae2a 100644 --- a/instrumentation/play/play-2.6/javaagent/play-2.6-javaagent.gradle +++ b/instrumentation/play/play-2.6/javaagent/play-2.6-javaagent.gradle @@ -1,4 +1,6 @@ -apply plugin: "otel.javaagent-instrumentation" +plugins { + id("otel.javaagent-instrumentation") +} def scalaVersion = '2.11' def playVersion = '2.6.0' diff --git a/instrumentation/rabbitmq-2.7/javaagent/rabbitmq-2.7-javaagent.gradle b/instrumentation/rabbitmq-2.7/javaagent/rabbitmq-2.7-javaagent.gradle index f8b77dc736..f229ec2f56 100644 --- a/instrumentation/rabbitmq-2.7/javaagent/rabbitmq-2.7-javaagent.gradle +++ b/instrumentation/rabbitmq-2.7/javaagent/rabbitmq-2.7-javaagent.gradle @@ -1,4 +1,6 @@ -apply plugin: "otel.javaagent-instrumentation" +plugins { + id("otel.javaagent-instrumentation") +} muzzle { pass { diff --git a/instrumentation/ratpack-1.4/javaagent/ratpack-1.4-javaagent.gradle b/instrumentation/ratpack-1.4/javaagent/ratpack-1.4-javaagent.gradle index 79e7da1050..bfb28ee4da 100644 --- a/instrumentation/ratpack-1.4/javaagent/ratpack-1.4-javaagent.gradle +++ b/instrumentation/ratpack-1.4/javaagent/ratpack-1.4-javaagent.gradle @@ -1,4 +1,6 @@ -apply plugin: "otel.javaagent-instrumentation" +plugins { + id("otel.javaagent-instrumentation") +} muzzle { pass { diff --git a/instrumentation/reactor-3.1/javaagent/reactor-3.1-javaagent.gradle b/instrumentation/reactor-3.1/javaagent/reactor-3.1-javaagent.gradle index 42abe37d1e..5eaa37b047 100644 --- a/instrumentation/reactor-3.1/javaagent/reactor-3.1-javaagent.gradle +++ b/instrumentation/reactor-3.1/javaagent/reactor-3.1-javaagent.gradle @@ -1,4 +1,6 @@ -apply plugin: "otel.javaagent-instrumentation" +plugins { + id("otel.javaagent-instrumentation") +} muzzle { pass { diff --git a/instrumentation/reactor-3.1/library/reactor-3.1-library.gradle b/instrumentation/reactor-3.1/library/reactor-3.1-library.gradle index a169f352f7..56bb81cddb 100644 --- a/instrumentation/reactor-3.1/library/reactor-3.1-library.gradle +++ b/instrumentation/reactor-3.1/library/reactor-3.1-library.gradle @@ -1,4 +1,6 @@ -apply plugin: "otel.library-instrumentation" +plugins { + id("otel.library-instrumentation") +} dependencies { library "io.projectreactor:reactor-core:3.1.0.RELEASE" diff --git a/instrumentation/reactor-3.1/testing/reactor-3.1-testing.gradle b/instrumentation/reactor-3.1/testing/reactor-3.1-testing.gradle index 376198eb03..0de0796e33 100644 --- a/instrumentation/reactor-3.1/testing/reactor-3.1-testing.gradle +++ b/instrumentation/reactor-3.1/testing/reactor-3.1-testing.gradle @@ -1,4 +1,6 @@ -apply plugin: "otel.java-conventions" +plugins { + id("otel.java-conventions") +} dependencies { api project(':testing-common') diff --git a/instrumentation/reactor-netty/reactor-netty-0.9/javaagent/reactor-netty-0.9-javaagent.gradle b/instrumentation/reactor-netty/reactor-netty-0.9/javaagent/reactor-netty-0.9-javaagent.gradle index 7ce38aa54c..62952248de 100644 --- a/instrumentation/reactor-netty/reactor-netty-0.9/javaagent/reactor-netty-0.9-javaagent.gradle +++ b/instrumentation/reactor-netty/reactor-netty-0.9/javaagent/reactor-netty-0.9-javaagent.gradle @@ -1,4 +1,6 @@ -apply plugin: "otel.javaagent-instrumentation" +plugins { + id("otel.javaagent-instrumentation") +} muzzle { pass { diff --git a/instrumentation/reactor-netty/reactor-netty-1.0/javaagent/reactor-netty-1.0-javaagent.gradle b/instrumentation/reactor-netty/reactor-netty-1.0/javaagent/reactor-netty-1.0-javaagent.gradle index 7f27ecda27..79a2f6b7f3 100644 --- a/instrumentation/reactor-netty/reactor-netty-1.0/javaagent/reactor-netty-1.0-javaagent.gradle +++ b/instrumentation/reactor-netty/reactor-netty-1.0/javaagent/reactor-netty-1.0-javaagent.gradle @@ -1,4 +1,6 @@ -apply plugin: "otel.javaagent-instrumentation" +plugins { + id("otel.javaagent-instrumentation") +} muzzle { fail { diff --git a/instrumentation/rediscala-1.8/javaagent/rediscala-1.8-javaagent.gradle b/instrumentation/rediscala-1.8/javaagent/rediscala-1.8-javaagent.gradle index bdcef3932b..fcaab0b5eb 100644 --- a/instrumentation/rediscala-1.8/javaagent/rediscala-1.8-javaagent.gradle +++ b/instrumentation/rediscala-1.8/javaagent/rediscala-1.8-javaagent.gradle @@ -1,4 +1,6 @@ -apply plugin: "otel.javaagent-instrumentation" +plugins { + id("otel.javaagent-instrumentation") +} muzzle { pass { diff --git a/instrumentation/redisson-3.0/javaagent/redisson-3.0-javaagent.gradle b/instrumentation/redisson-3.0/javaagent/redisson-3.0-javaagent.gradle index 8ba972a7b9..1669f259cb 100644 --- a/instrumentation/redisson-3.0/javaagent/redisson-3.0-javaagent.gradle +++ b/instrumentation/redisson-3.0/javaagent/redisson-3.0-javaagent.gradle @@ -1,4 +1,6 @@ -apply plugin: "otel.javaagent-instrumentation" +plugins { + id("otel.javaagent-instrumentation") +} muzzle { pass { diff --git a/instrumentation/rmi/javaagent/rmi-javaagent.gradle b/instrumentation/rmi/javaagent/rmi-javaagent.gradle index ea56c2a1e0..7b34a24175 100644 --- a/instrumentation/rmi/javaagent/rmi-javaagent.gradle +++ b/instrumentation/rmi/javaagent/rmi-javaagent.gradle @@ -1,4 +1,6 @@ -apply plugin: "otel.javaagent-instrumentation" +plugins { + id("otel.javaagent-instrumentation") +} muzzle { pass { diff --git a/instrumentation/rocketmq-client-4.8/javaagent/rocketmq-client-4.8-javaagent.gradle b/instrumentation/rocketmq-client-4.8/javaagent/rocketmq-client-4.8-javaagent.gradle index e9ae116184..1226e280e3 100644 --- a/instrumentation/rocketmq-client-4.8/javaagent/rocketmq-client-4.8-javaagent.gradle +++ b/instrumentation/rocketmq-client-4.8/javaagent/rocketmq-client-4.8-javaagent.gradle @@ -1,4 +1,6 @@ -apply plugin: "otel.javaagent-instrumentation" +plugins { + id("otel.javaagent-instrumentation") +} muzzle { pass { diff --git a/instrumentation/rocketmq-client-4.8/library/rocketmq-client-4.8-library.gradle b/instrumentation/rocketmq-client-4.8/library/rocketmq-client-4.8-library.gradle index c5da250f99..81f14994ba 100644 --- a/instrumentation/rocketmq-client-4.8/library/rocketmq-client-4.8-library.gradle +++ b/instrumentation/rocketmq-client-4.8/library/rocketmq-client-4.8-library.gradle @@ -1,4 +1,6 @@ -apply plugin: "otel.library-instrumentation" +plugins { + id("otel.library-instrumentation") +} dependencies { library "org.apache.rocketmq:rocketmq-client:4.8.0" diff --git a/instrumentation/rocketmq-client-4.8/testing/rocketmq-client-4.8-testing.gradle b/instrumentation/rocketmq-client-4.8/testing/rocketmq-client-4.8-testing.gradle index 8e8ce8df60..09e97e995a 100644 --- a/instrumentation/rocketmq-client-4.8/testing/rocketmq-client-4.8-testing.gradle +++ b/instrumentation/rocketmq-client-4.8/testing/rocketmq-client-4.8-testing.gradle @@ -1,4 +1,6 @@ -apply plugin: "otel.java-conventions" +plugins { + id("otel.java-conventions") +} dependencies { api project(':testing-common') diff --git a/instrumentation/runtime-metrics/javaagent/runtime-metrics-javaagent.gradle b/instrumentation/runtime-metrics/javaagent/runtime-metrics-javaagent.gradle index 4f6b045f37..c0196bc748 100644 --- a/instrumentation/runtime-metrics/javaagent/runtime-metrics-javaagent.gradle +++ b/instrumentation/runtime-metrics/javaagent/runtime-metrics-javaagent.gradle @@ -1,4 +1,6 @@ -apply plugin: "otel.javaagent-instrumentation" +plugins { + id("otel.javaagent-instrumentation") +} dependencies { implementation project(':instrumentation:runtime-metrics:library') diff --git a/instrumentation/runtime-metrics/library/runtime-metrics-library.gradle b/instrumentation/runtime-metrics/library/runtime-metrics-library.gradle index b1887f7a15..24d1c6ffc3 100644 --- a/instrumentation/runtime-metrics/library/runtime-metrics-library.gradle +++ b/instrumentation/runtime-metrics/library/runtime-metrics-library.gradle @@ -1,4 +1,6 @@ -apply plugin: "otel.library-instrumentation" +plugins { + id("otel.library-instrumentation") +} dependencies { implementation "io.opentelemetry:opentelemetry-api-metrics" diff --git a/instrumentation/rxjava/rxjava-1.0/library/rxjava-1.0-library.gradle b/instrumentation/rxjava/rxjava-1.0/library/rxjava-1.0-library.gradle index 99ec0063fb..341cddc022 100644 --- a/instrumentation/rxjava/rxjava-1.0/library/rxjava-1.0-library.gradle +++ b/instrumentation/rxjava/rxjava-1.0/library/rxjava-1.0-library.gradle @@ -1,4 +1,6 @@ -apply plugin: "otel.library-instrumentation" +plugins { + id("otel.library-instrumentation") +} dependencies { library "io.reactivex:rxjava:1.0.7" diff --git a/instrumentation/rxjava/rxjava-2.0/javaagent/rxjava-2.0-javaagent.gradle b/instrumentation/rxjava/rxjava-2.0/javaagent/rxjava-2.0-javaagent.gradle index eedce9a903..9d2b669303 100644 --- a/instrumentation/rxjava/rxjava-2.0/javaagent/rxjava-2.0-javaagent.gradle +++ b/instrumentation/rxjava/rxjava-2.0/javaagent/rxjava-2.0-javaagent.gradle @@ -1,4 +1,6 @@ -apply plugin: "otel.javaagent-instrumentation" +plugins { + id("otel.javaagent-instrumentation") +} muzzle { pass { diff --git a/instrumentation/rxjava/rxjava-2.0/library/rxjava-2.0-library.gradle b/instrumentation/rxjava/rxjava-2.0/library/rxjava-2.0-library.gradle index 1866b7331f..72964137f2 100644 --- a/instrumentation/rxjava/rxjava-2.0/library/rxjava-2.0-library.gradle +++ b/instrumentation/rxjava/rxjava-2.0/library/rxjava-2.0-library.gradle @@ -1,4 +1,6 @@ -apply plugin: "otel.library-instrumentation" +plugins { + id("otel.library-instrumentation") +} dependencies { library "io.reactivex.rxjava2:rxjava:2.1.3" diff --git a/instrumentation/rxjava/rxjava-2.0/testing/rxjava-2.0-testing.gradle b/instrumentation/rxjava/rxjava-2.0/testing/rxjava-2.0-testing.gradle index 74aaba1de2..314b001eab 100644 --- a/instrumentation/rxjava/rxjava-2.0/testing/rxjava-2.0-testing.gradle +++ b/instrumentation/rxjava/rxjava-2.0/testing/rxjava-2.0-testing.gradle @@ -1,4 +1,6 @@ -apply plugin: "otel.java-conventions" +plugins { + id("otel.java-conventions") +} dependencies { api project(':testing-common') diff --git a/instrumentation/rxjava/rxjava-3.0/javaagent/rxjava-3.0-javaagent.gradle b/instrumentation/rxjava/rxjava-3.0/javaagent/rxjava-3.0-javaagent.gradle index 18ee95c748..f1252b45f0 100644 --- a/instrumentation/rxjava/rxjava-3.0/javaagent/rxjava-3.0-javaagent.gradle +++ b/instrumentation/rxjava/rxjava-3.0/javaagent/rxjava-3.0-javaagent.gradle @@ -1,4 +1,6 @@ -apply plugin: "otel.javaagent-instrumentation" +plugins { + id("otel.javaagent-instrumentation") +} muzzle { pass { diff --git a/instrumentation/rxjava/rxjava-3.0/library/rxjava-3.0-library.gradle b/instrumentation/rxjava/rxjava-3.0/library/rxjava-3.0-library.gradle index a69d0ad90b..44172a7879 100644 --- a/instrumentation/rxjava/rxjava-3.0/library/rxjava-3.0-library.gradle +++ b/instrumentation/rxjava/rxjava-3.0/library/rxjava-3.0-library.gradle @@ -1,4 +1,6 @@ -apply plugin: "otel.library-instrumentation" +plugins { + id("otel.library-instrumentation") +} dependencies { library "io.reactivex.rxjava3:rxjava:3.0.12" diff --git a/instrumentation/rxjava/rxjava-3.0/testing/rxjava-3.0-testing.gradle b/instrumentation/rxjava/rxjava-3.0/testing/rxjava-3.0-testing.gradle index fcace56e2f..247be8a9b0 100644 --- a/instrumentation/rxjava/rxjava-3.0/testing/rxjava-3.0-testing.gradle +++ b/instrumentation/rxjava/rxjava-3.0/testing/rxjava-3.0-testing.gradle @@ -1,4 +1,6 @@ -apply plugin: "otel.java-conventions" +plugins { + id("otel.java-conventions") +} dependencies { api project(':testing-common') diff --git a/instrumentation/scala-executors/javaagent/scala-executors-javaagent.gradle b/instrumentation/scala-executors/javaagent/scala-executors-javaagent.gradle index d1205403a0..8a2a361c8e 100644 --- a/instrumentation/scala-executors/javaagent/scala-executors-javaagent.gradle +++ b/instrumentation/scala-executors/javaagent/scala-executors-javaagent.gradle @@ -1,6 +1,8 @@ -apply plugin: "otel.javaagent-instrumentation" -apply plugin: "otel.scala-conventions" -apply plugin: 'org.unbroken-dome.test-sets' +plugins { + id("otel.javaagent-instrumentation") + id("otel.scala-conventions") + id("org.unbroken-dome.test-sets") +} muzzle { pass { diff --git a/instrumentation/servlet/servlet-2.2/javaagent/servlet-2.2-javaagent.gradle b/instrumentation/servlet/servlet-2.2/javaagent/servlet-2.2-javaagent.gradle index f50853f311..0da87e6c9b 100644 --- a/instrumentation/servlet/servlet-2.2/javaagent/servlet-2.2-javaagent.gradle +++ b/instrumentation/servlet/servlet-2.2/javaagent/servlet-2.2-javaagent.gradle @@ -1,4 +1,6 @@ -apply plugin: "otel.javaagent-instrumentation" +plugins { + id("otel.javaagent-instrumentation") +} muzzle { pass { diff --git a/instrumentation/servlet/servlet-2.2/library/servlet-2.2-library.gradle b/instrumentation/servlet/servlet-2.2/library/servlet-2.2-library.gradle index c583a523d4..c04b4f5059 100644 --- a/instrumentation/servlet/servlet-2.2/library/servlet-2.2-library.gradle +++ b/instrumentation/servlet/servlet-2.2/library/servlet-2.2-library.gradle @@ -1,4 +1,6 @@ -apply plugin: "otel.library-instrumentation" +plugins { + id("otel.library-instrumentation") +} dependencies { implementation "org.slf4j:slf4j-api" diff --git a/instrumentation/servlet/servlet-3.0/javaagent/servlet-3.0-javaagent.gradle b/instrumentation/servlet/servlet-3.0/javaagent/servlet-3.0-javaagent.gradle index 16a350eab7..520423d699 100644 --- a/instrumentation/servlet/servlet-3.0/javaagent/servlet-3.0-javaagent.gradle +++ b/instrumentation/servlet/servlet-3.0/javaagent/servlet-3.0-javaagent.gradle @@ -1,5 +1,6 @@ -apply plugin: "otel.javaagent-instrumentation" - +plugins { + id("otel.javaagent-instrumentation") +} muzzle { pass { group = "javax.servlet" diff --git a/instrumentation/servlet/servlet-3.0/library/servlet-3.0-library.gradle b/instrumentation/servlet/servlet-3.0/library/servlet-3.0-library.gradle index bbffa5fad9..850cd2e2c7 100644 --- a/instrumentation/servlet/servlet-3.0/library/servlet-3.0-library.gradle +++ b/instrumentation/servlet/servlet-3.0/library/servlet-3.0-library.gradle @@ -1,4 +1,6 @@ -apply plugin: "otel.library-instrumentation" +plugins { + id("otel.library-instrumentation") +} dependencies { api(project(':instrumentation:servlet:servlet-javax-common:library')) diff --git a/instrumentation/servlet/servlet-5.0/javaagent/servlet-5.0-javaagent.gradle b/instrumentation/servlet/servlet-5.0/javaagent/servlet-5.0-javaagent.gradle index f0a49fcafa..ea54277bf7 100644 --- a/instrumentation/servlet/servlet-5.0/javaagent/servlet-5.0-javaagent.gradle +++ b/instrumentation/servlet/servlet-5.0/javaagent/servlet-5.0-javaagent.gradle @@ -1,4 +1,6 @@ -apply plugin: "otel.javaagent-instrumentation" +plugins { + id("otel.javaagent-instrumentation") +} muzzle { pass { diff --git a/instrumentation/servlet/servlet-5.0/library/servlet-5.0-library.gradle b/instrumentation/servlet/servlet-5.0/library/servlet-5.0-library.gradle index 2ae155aca4..0866b1793d 100644 --- a/instrumentation/servlet/servlet-5.0/library/servlet-5.0-library.gradle +++ b/instrumentation/servlet/servlet-5.0/library/servlet-5.0-library.gradle @@ -1,4 +1,6 @@ -apply plugin: "otel.library-instrumentation" +plugins { + id("otel.library-instrumentation") +} dependencies { api(project(':instrumentation:servlet:servlet-common:library')) diff --git a/instrumentation/servlet/servlet-common/javaagent/servlet-common-javaagent.gradle b/instrumentation/servlet/servlet-common/javaagent/servlet-common-javaagent.gradle index 4d63fd335b..120057a99e 100644 --- a/instrumentation/servlet/servlet-common/javaagent/servlet-common-javaagent.gradle +++ b/instrumentation/servlet/servlet-common/javaagent/servlet-common-javaagent.gradle @@ -1,4 +1,6 @@ -apply plugin: "otel.javaagent-instrumentation" +plugins { + id("otel.javaagent-instrumentation") +} // This module is only used as a dependency for other javaagent modules and does not contain any // non-abstract implementations of InstrumentationModule diff --git a/instrumentation/servlet/servlet-common/library/servlet-common-library.gradle b/instrumentation/servlet/servlet-common/library/servlet-common-library.gradle index 77e3d73e95..547115ca98 100644 --- a/instrumentation/servlet/servlet-common/library/servlet-common-library.gradle +++ b/instrumentation/servlet/servlet-common/library/servlet-common-library.gradle @@ -1,4 +1,6 @@ -apply plugin: "otel.library-instrumentation" +plugins { + id("otel.library-instrumentation") +} dependencies { implementation "org.slf4j:slf4j-api" diff --git a/instrumentation/servlet/servlet-javax-common/javaagent/servlet-javax-common-javaagent.gradle b/instrumentation/servlet/servlet-javax-common/javaagent/servlet-javax-common-javaagent.gradle index cbb7480356..27a6274d95 100644 --- a/instrumentation/servlet/servlet-javax-common/javaagent/servlet-javax-common-javaagent.gradle +++ b/instrumentation/servlet/servlet-javax-common/javaagent/servlet-javax-common-javaagent.gradle @@ -1,4 +1,6 @@ -apply plugin: "otel.javaagent-instrumentation" +plugins { + id("otel.javaagent-instrumentation") +} muzzle { pass { diff --git a/instrumentation/servlet/servlet-javax-common/library/servlet-javax-common-library.gradle b/instrumentation/servlet/servlet-javax-common/library/servlet-javax-common-library.gradle index 137a1089c8..970001beb5 100644 --- a/instrumentation/servlet/servlet-javax-common/library/servlet-javax-common-library.gradle +++ b/instrumentation/servlet/servlet-javax-common/library/servlet-javax-common-library.gradle @@ -1,4 +1,6 @@ -apply plugin: "otel.library-instrumentation" +plugins { + id("otel.library-instrumentation") +} dependencies { implementation "org.slf4j:slf4j-api" diff --git a/instrumentation/spark-2.3/javaagent/spark-2.3-javaagent.gradle b/instrumentation/spark-2.3/javaagent/spark-2.3-javaagent.gradle index fa995db6f8..6eecf93416 100644 --- a/instrumentation/spark-2.3/javaagent/spark-2.3-javaagent.gradle +++ b/instrumentation/spark-2.3/javaagent/spark-2.3-javaagent.gradle @@ -1,4 +1,6 @@ -apply plugin: "otel.javaagent-instrumentation" +plugins { + id("otel.javaagent-instrumentation") +} // building against 2.3 and testing against 2.4 because JettyHandler is available since 2.4 only muzzle { diff --git a/instrumentation/spring/spring-batch-3.0/javaagent/spring-batch-3.0-javaagent.gradle b/instrumentation/spring/spring-batch-3.0/javaagent/spring-batch-3.0-javaagent.gradle index 307a638d56..563e88abe2 100644 --- a/instrumentation/spring/spring-batch-3.0/javaagent/spring-batch-3.0-javaagent.gradle +++ b/instrumentation/spring/spring-batch-3.0/javaagent/spring-batch-3.0-javaagent.gradle @@ -1,4 +1,6 @@ -apply plugin: "otel.javaagent-instrumentation" +plugins { + id("otel.javaagent-instrumentation") +} muzzle { pass { diff --git a/instrumentation/spring/spring-boot-autoconfigure/spring-boot-autoconfigure.gradle b/instrumentation/spring/spring-boot-autoconfigure/spring-boot-autoconfigure.gradle index 48df1542d8..ac6243c654 100644 --- a/instrumentation/spring/spring-boot-autoconfigure/spring-boot-autoconfigure.gradle +++ b/instrumentation/spring/spring-boot-autoconfigure/spring-boot-autoconfigure.gradle @@ -1,7 +1,9 @@ -group = 'io.opentelemetry.instrumentation' +plugins { + id("otel.java-conventions") + id("otel.publish-conventions") +} -apply plugin: "otel.java-conventions" -apply plugin: "otel.publish-conventions" +group = 'io.opentelemetry.instrumentation' sourceCompatibility = '8' diff --git a/instrumentation/spring/spring-core-2.0/javaagent/spring-core-2.0-javaagent.gradle b/instrumentation/spring/spring-core-2.0/javaagent/spring-core-2.0-javaagent.gradle index e68d588d48..ed328ec70b 100644 --- a/instrumentation/spring/spring-core-2.0/javaagent/spring-core-2.0-javaagent.gradle +++ b/instrumentation/spring/spring-core-2.0/javaagent/spring-core-2.0-javaagent.gradle @@ -1,4 +1,6 @@ -apply plugin: "otel.javaagent-instrumentation" +plugins { + id("otel.javaagent-instrumentation") +} muzzle { pass { diff --git a/instrumentation/spring/spring-data-1.8/javaagent/spring-data-1.8-javaagent.gradle b/instrumentation/spring/spring-data-1.8/javaagent/spring-data-1.8-javaagent.gradle index 3b1284f482..839de662c8 100644 --- a/instrumentation/spring/spring-data-1.8/javaagent/spring-data-1.8-javaagent.gradle +++ b/instrumentation/spring/spring-data-1.8/javaagent/spring-data-1.8-javaagent.gradle @@ -1,4 +1,6 @@ -apply plugin: "otel.javaagent-instrumentation" +plugins { + id("otel.javaagent-instrumentation") +} muzzle { // We have two independent covariants, so we have to test them independently. diff --git a/instrumentation/spring/spring-integration-4.1/javaagent/spring-integration-4.1-javaagent.gradle b/instrumentation/spring/spring-integration-4.1/javaagent/spring-integration-4.1-javaagent.gradle index e6638cb677..1ce91d25c6 100644 --- a/instrumentation/spring/spring-integration-4.1/javaagent/spring-integration-4.1-javaagent.gradle +++ b/instrumentation/spring/spring-integration-4.1/javaagent/spring-integration-4.1-javaagent.gradle @@ -1,4 +1,6 @@ -apply plugin: "otel.javaagent-instrumentation" +plugins { + id("otel.javaagent-instrumentation") +} ext { // context "leak" here is intentional: spring-integration instrumentation will always override diff --git a/instrumentation/spring/spring-integration-4.1/library/spring-integration-4.1-library.gradle b/instrumentation/spring/spring-integration-4.1/library/spring-integration-4.1-library.gradle index 8e3c16e154..f1423d66b9 100644 --- a/instrumentation/spring/spring-integration-4.1/library/spring-integration-4.1-library.gradle +++ b/instrumentation/spring/spring-integration-4.1/library/spring-integration-4.1-library.gradle @@ -1,4 +1,6 @@ -apply plugin: "otel.library-instrumentation" +plugins { + id("otel.library-instrumentation") +} dependencies { compileOnly "com.google.auto.value:auto-value-annotations" diff --git a/instrumentation/spring/spring-integration-4.1/testing/spring-integration-4.1-testing.gradle b/instrumentation/spring/spring-integration-4.1/testing/spring-integration-4.1-testing.gradle index 71ae108e71..e87bd97ae5 100644 --- a/instrumentation/spring/spring-integration-4.1/testing/spring-integration-4.1-testing.gradle +++ b/instrumentation/spring/spring-integration-4.1/testing/spring-integration-4.1-testing.gradle @@ -1,4 +1,6 @@ -apply plugin: "otel.java-conventions" +plugins { + id("otel.java-conventions") +} dependencies { api project(':testing-common') diff --git a/instrumentation/spring/spring-scheduling-3.1/javaagent/spring-scheduling-3.1-javaagent.gradle b/instrumentation/spring/spring-scheduling-3.1/javaagent/spring-scheduling-3.1-javaagent.gradle index 1e8e30c544..158dc7580a 100644 --- a/instrumentation/spring/spring-scheduling-3.1/javaagent/spring-scheduling-3.1-javaagent.gradle +++ b/instrumentation/spring/spring-scheduling-3.1/javaagent/spring-scheduling-3.1-javaagent.gradle @@ -1,4 +1,6 @@ -apply plugin: "otel.javaagent-instrumentation" +plugins { + id("otel.javaagent-instrumentation") +} muzzle { pass { diff --git a/instrumentation/spring/spring-web-3.1/library/spring-web-3.1-library.gradle b/instrumentation/spring/spring-web-3.1/library/spring-web-3.1-library.gradle index 8fbc6c16f8..c2a631c5fe 100644 --- a/instrumentation/spring/spring-web-3.1/library/spring-web-3.1-library.gradle +++ b/instrumentation/spring/spring-web-3.1/library/spring-web-3.1-library.gradle @@ -1,4 +1,6 @@ -apply plugin: "otel.library-instrumentation" +plugins { + id("otel.library-instrumentation") +} dependencies { compileOnly "org.springframework:spring-web:3.1.0.RELEASE" diff --git a/instrumentation/spring/spring-webflux-5.0/javaagent/spring-webflux-5.0-javaagent.gradle b/instrumentation/spring/spring-webflux-5.0/javaagent/spring-webflux-5.0-javaagent.gradle index e6a4cb710d..1d74e979b4 100644 --- a/instrumentation/spring/spring-webflux-5.0/javaagent/spring-webflux-5.0-javaagent.gradle +++ b/instrumentation/spring/spring-webflux-5.0/javaagent/spring-webflux-5.0-javaagent.gradle @@ -1,4 +1,6 @@ -apply plugin: "otel.javaagent-instrumentation" +plugins { + id("otel.javaagent-instrumentation") +} muzzle { pass { diff --git a/instrumentation/spring/spring-webflux-5.0/library/spring-webflux-5.0-library.gradle b/instrumentation/spring/spring-webflux-5.0/library/spring-webflux-5.0-library.gradle index fcc408c120..8d8128b4be 100644 --- a/instrumentation/spring/spring-webflux-5.0/library/spring-webflux-5.0-library.gradle +++ b/instrumentation/spring/spring-webflux-5.0/library/spring-webflux-5.0-library.gradle @@ -1,4 +1,6 @@ -apply plugin: "otel.library-instrumentation" +plugins { + id("otel.library-instrumentation") +} dependencies { compileOnly "org.springframework:spring-webflux:5.0.0.RELEASE" diff --git a/instrumentation/spring/spring-webmvc-3.1/javaagent/spring-webmvc-3.1-javaagent.gradle b/instrumentation/spring/spring-webmvc-3.1/javaagent/spring-webmvc-3.1-javaagent.gradle index 188e8c84ae..5f751b18af 100644 --- a/instrumentation/spring/spring-webmvc-3.1/javaagent/spring-webmvc-3.1-javaagent.gradle +++ b/instrumentation/spring/spring-webmvc-3.1/javaagent/spring-webmvc-3.1-javaagent.gradle @@ -1,4 +1,6 @@ -apply plugin: "otel.javaagent-instrumentation" +plugins { + id("otel.javaagent-instrumentation") +} muzzle { pass { diff --git a/instrumentation/spring/spring-webmvc-3.1/library/spring-webmvc-3.1-library.gradle b/instrumentation/spring/spring-webmvc-3.1/library/spring-webmvc-3.1-library.gradle index 655bf50dd1..3ad8c19582 100644 --- a/instrumentation/spring/spring-webmvc-3.1/library/spring-webmvc-3.1-library.gradle +++ b/instrumentation/spring/spring-webmvc-3.1/library/spring-webmvc-3.1-library.gradle @@ -1,4 +1,6 @@ -apply plugin: "otel.library-instrumentation" +plugins { + id("otel.library-instrumentation") +} dependencies { implementation project(':instrumentation:servlet:servlet-common:library') diff --git a/instrumentation/spring/spring-ws-2.0/javaagent/spring-ws-2.0-javaagent.gradle b/instrumentation/spring/spring-ws-2.0/javaagent/spring-ws-2.0-javaagent.gradle index b68d091823..62fb6e9b9d 100644 --- a/instrumentation/spring/spring-ws-2.0/javaagent/spring-ws-2.0-javaagent.gradle +++ b/instrumentation/spring/spring-ws-2.0/javaagent/spring-ws-2.0-javaagent.gradle @@ -1,9 +1,8 @@ plugins { id "org.unbroken-dome.xjc" version "2.0.0" + id("otel.javaagent-instrumentation") } -apply plugin: "otel.javaagent-instrumentation" - muzzle { pass { group = 'org.springframework.ws' diff --git a/instrumentation/spring/starters/jaeger-exporter-starter/jaeger-exporter-starter.gradle b/instrumentation/spring/starters/jaeger-exporter-starter/jaeger-exporter-starter.gradle index 6369a78088..aed96da391 100644 --- a/instrumentation/spring/starters/jaeger-exporter-starter/jaeger-exporter-starter.gradle +++ b/instrumentation/spring/starters/jaeger-exporter-starter/jaeger-exporter-starter.gradle @@ -1,14 +1,14 @@ +plugins { + id("otel.java-conventions") + id("otel.publish-conventions") +} + ext { springbootVersion = "2.3.1.RELEASE" } group = 'io.opentelemetry.instrumentation' -apply plugin: "otel.java-conventions" -apply plugin: "otel.publish-conventions" - -sourceCompatibility = '8' - dependencies { api group: "org.springframework.boot", name: "spring-boot-starter", version: versions["org.springframework.boot"] api project(':instrumentation:spring:starters:spring-starter') diff --git a/instrumentation/spring/starters/otlp-exporter-starter/otlp-exporter-starter.gradle b/instrumentation/spring/starters/otlp-exporter-starter/otlp-exporter-starter.gradle index 497d64a18a..fb263e8608 100644 --- a/instrumentation/spring/starters/otlp-exporter-starter/otlp-exporter-starter.gradle +++ b/instrumentation/spring/starters/otlp-exporter-starter/otlp-exporter-starter.gradle @@ -1,10 +1,10 @@ +plugins { + id("otel.java-conventions") + id("otel.publish-conventions") +} + group = 'io.opentelemetry.instrumentation' -apply plugin: "otel.java-conventions" -apply plugin: "otel.publish-conventions" - -sourceCompatibility = '8' - dependencies { api group: "org.springframework.boot", name: "spring-boot-starter", version: versions["org.springframework.boot"] api project(':instrumentation:spring:starters:spring-starter') diff --git a/instrumentation/spring/starters/spring-starter/spring-starter.gradle b/instrumentation/spring/starters/spring-starter/spring-starter.gradle index 94c94faa09..1e93315214 100644 --- a/instrumentation/spring/starters/spring-starter/spring-starter.gradle +++ b/instrumentation/spring/starters/spring-starter/spring-starter.gradle @@ -1,10 +1,10 @@ +plugins { + id("otel.java-conventions") + id("otel.publish-conventions") +} + group = 'io.opentelemetry.instrumentation' -apply plugin: "otel.java-conventions" -apply plugin: "otel.publish-conventions" - -sourceCompatibility = '8' - dependencies { api group: "org.springframework.boot", name: "spring-boot-starter", version: versions["org.springframework.boot"] api "org.springframework.boot:spring-boot-starter-aop:${versions["org.springframework.boot"]}" diff --git a/instrumentation/spring/starters/zipkin-exporter-starter/zipkin-exporter-starter.gradle b/instrumentation/spring/starters/zipkin-exporter-starter/zipkin-exporter-starter.gradle index db4d443849..c363ac693a 100644 --- a/instrumentation/spring/starters/zipkin-exporter-starter/zipkin-exporter-starter.gradle +++ b/instrumentation/spring/starters/zipkin-exporter-starter/zipkin-exporter-starter.gradle @@ -1,10 +1,10 @@ +plugins { + id("otel.java-conventions") + id("otel.publish-conventions") +} + group = 'io.opentelemetry.instrumentation' -apply plugin: "otel.java-conventions" -apply plugin: "otel.publish-conventions" - -sourceCompatibility = '8' - dependencies { api group: "org.springframework.boot", name: "spring-boot-starter", version: versions["org.springframework.boot"] api project(':instrumentation:spring:starters:spring-starter') diff --git a/instrumentation/spymemcached-2.12/javaagent/spymemcached-2.12-javaagent.gradle b/instrumentation/spymemcached-2.12/javaagent/spymemcached-2.12-javaagent.gradle index 4580977fda..32ae55f501 100644 --- a/instrumentation/spymemcached-2.12/javaagent/spymemcached-2.12-javaagent.gradle +++ b/instrumentation/spymemcached-2.12/javaagent/spymemcached-2.12-javaagent.gradle @@ -1,4 +1,6 @@ -apply plugin: "otel.javaagent-instrumentation" +plugins { + id("otel.javaagent-instrumentation") +} muzzle { pass { diff --git a/instrumentation/struts-2.3/javaagent/struts-2.3-javaagent.gradle b/instrumentation/struts-2.3/javaagent/struts-2.3-javaagent.gradle index 5193326097..73e018cfb6 100644 --- a/instrumentation/struts-2.3/javaagent/struts-2.3-javaagent.gradle +++ b/instrumentation/struts-2.3/javaagent/struts-2.3-javaagent.gradle @@ -1,4 +1,6 @@ -apply plugin: "otel.javaagent-instrumentation" +plugins { + id("otel.javaagent-instrumentation") +} muzzle { pass { diff --git a/instrumentation/tapestry-5.4/javaagent/tapestry-5.4-javaagent.gradle b/instrumentation/tapestry-5.4/javaagent/tapestry-5.4-javaagent.gradle index f3b46bdc10..21e396d320 100644 --- a/instrumentation/tapestry-5.4/javaagent/tapestry-5.4-javaagent.gradle +++ b/instrumentation/tapestry-5.4/javaagent/tapestry-5.4-javaagent.gradle @@ -1,4 +1,6 @@ -apply plugin: "otel.javaagent-instrumentation" +plugins { + id("otel.javaagent-instrumentation") +} muzzle { pass { diff --git a/instrumentation/tomcat/tomcat-10.0/javaagent/tomcat-10.0-javaagent.gradle b/instrumentation/tomcat/tomcat-10.0/javaagent/tomcat-10.0-javaagent.gradle index 38cb6f0dce..20778d67ad 100644 --- a/instrumentation/tomcat/tomcat-10.0/javaagent/tomcat-10.0-javaagent.gradle +++ b/instrumentation/tomcat/tomcat-10.0/javaagent/tomcat-10.0-javaagent.gradle @@ -1,4 +1,6 @@ -apply plugin: "otel.javaagent-instrumentation" +plugins { + id("otel.javaagent-instrumentation") +} muzzle { pass { diff --git a/instrumentation/tomcat/tomcat-7.0/javaagent/tomcat-7.0-javaagent.gradle b/instrumentation/tomcat/tomcat-7.0/javaagent/tomcat-7.0-javaagent.gradle index b1ef78ce93..2fcc4b56da 100644 --- a/instrumentation/tomcat/tomcat-7.0/javaagent/tomcat-7.0-javaagent.gradle +++ b/instrumentation/tomcat/tomcat-7.0/javaagent/tomcat-7.0-javaagent.gradle @@ -1,4 +1,6 @@ -apply plugin: "otel.javaagent-instrumentation" +plugins { + id("otel.javaagent-instrumentation") +} muzzle { pass { diff --git a/instrumentation/tomcat/tomcat-common/javaagent/tomcat-common-javaagent.gradle b/instrumentation/tomcat/tomcat-common/javaagent/tomcat-common-javaagent.gradle index 8cd11077e0..1fad9e66a4 100644 --- a/instrumentation/tomcat/tomcat-common/javaagent/tomcat-common-javaagent.gradle +++ b/instrumentation/tomcat/tomcat-common/javaagent/tomcat-common-javaagent.gradle @@ -1,4 +1,6 @@ -apply plugin: "otel.javaagent-instrumentation" +plugins { + id("otel.javaagent-instrumentation") +} dependencies { api(project(':instrumentation:servlet:servlet-common:library')) diff --git a/instrumentation/twilio-6.6/javaagent/twilio-6.6-javaagent.gradle b/instrumentation/twilio-6.6/javaagent/twilio-6.6-javaagent.gradle index f9f2cbcdc1..fe88a36203 100644 --- a/instrumentation/twilio-6.6/javaagent/twilio-6.6-javaagent.gradle +++ b/instrumentation/twilio-6.6/javaagent/twilio-6.6-javaagent.gradle @@ -1,4 +1,6 @@ -apply plugin: "otel.javaagent-instrumentation" +plugins { + id("otel.javaagent-instrumentation") +} muzzle { pass { diff --git a/instrumentation/undertow-1.4/javaagent/undertow-1.4-javaagent.gradle b/instrumentation/undertow-1.4/javaagent/undertow-1.4-javaagent.gradle index 0cb512ca75..11b4ff91c4 100644 --- a/instrumentation/undertow-1.4/javaagent/undertow-1.4-javaagent.gradle +++ b/instrumentation/undertow-1.4/javaagent/undertow-1.4-javaagent.gradle @@ -1,4 +1,6 @@ -apply plugin: "otel.javaagent-instrumentation" +plugins { + id("otel.javaagent-instrumentation") +} muzzle { pass { diff --git a/instrumentation/vaadin-14.2/javaagent/vaadin-14.2-javaagent.gradle b/instrumentation/vaadin-14.2/javaagent/vaadin-14.2-javaagent.gradle index eac83d4821..63afb611d5 100644 --- a/instrumentation/vaadin-14.2/javaagent/vaadin-14.2-javaagent.gradle +++ b/instrumentation/vaadin-14.2/javaagent/vaadin-14.2-javaagent.gradle @@ -1,5 +1,7 @@ -apply plugin: "otel.javaagent-instrumentation" -apply plugin: 'org.unbroken-dome.test-sets' +plugins { + id("otel.javaagent-instrumentation") + id("org.unbroken-dome.test-sets") +} muzzle { fail { diff --git a/instrumentation/vertx-reactive-3.5/javaagent/vertx-reactive-3.5-javaagent.gradle b/instrumentation/vertx-reactive-3.5/javaagent/vertx-reactive-3.5-javaagent.gradle index 9d8b19182e..257501f7e7 100644 --- a/instrumentation/vertx-reactive-3.5/javaagent/vertx-reactive-3.5-javaagent.gradle +++ b/instrumentation/vertx-reactive-3.5/javaagent/vertx-reactive-3.5-javaagent.gradle @@ -1,4 +1,6 @@ -apply plugin: "otel.javaagent-instrumentation" +plugins { + id("otel.javaagent-instrumentation") +} muzzle { pass { diff --git a/instrumentation/vertx-web-3.0/javaagent/vertx-web-3.0-javaagent.gradle b/instrumentation/vertx-web-3.0/javaagent/vertx-web-3.0-javaagent.gradle index f9696ce1eb..d058332836 100644 --- a/instrumentation/vertx-web-3.0/javaagent/vertx-web-3.0-javaagent.gradle +++ b/instrumentation/vertx-web-3.0/javaagent/vertx-web-3.0-javaagent.gradle @@ -1,4 +1,6 @@ -apply plugin: "otel.javaagent-instrumentation" +plugins { + id("otel.javaagent-instrumentation") +} muzzle { pass { diff --git a/instrumentation/wicket-8.0/javaagent/wicket-8.0-javaagent.gradle b/instrumentation/wicket-8.0/javaagent/wicket-8.0-javaagent.gradle index 760e5e1808..d086c2a528 100644 --- a/instrumentation/wicket-8.0/javaagent/wicket-8.0-javaagent.gradle +++ b/instrumentation/wicket-8.0/javaagent/wicket-8.0-javaagent.gradle @@ -1,4 +1,6 @@ -apply plugin: "otel.javaagent-instrumentation" +plugins { + id("otel.javaagent-instrumentation") +} muzzle { pass { diff --git a/javaagent-api/javaagent-api.gradle b/javaagent-api/javaagent-api.gradle index 73e6aeb055..b139d6e1bd 100644 --- a/javaagent-api/javaagent-api.gradle +++ b/javaagent-api/javaagent-api.gradle @@ -1,8 +1,11 @@ +plugins { + id("otel.java-conventions") + id("otel.jacoco-conventions") + id("otel.publish-conventions") +} + group = 'io.opentelemetry.javaagent' -apply plugin: "otel.java-conventions" -apply plugin: "otel.jacoco-conventions" -apply plugin: "otel.publish-conventions" dependencies { api "io.opentelemetry:opentelemetry-api" diff --git a/javaagent-bootstrap-tests/javaagent-bootstrap-tests.gradle b/javaagent-bootstrap-tests/javaagent-bootstrap-tests.gradle index 843da4c6c0..289a730e7f 100644 --- a/javaagent-bootstrap-tests/javaagent-bootstrap-tests.gradle +++ b/javaagent-bootstrap-tests/javaagent-bootstrap-tests.gradle @@ -1,4 +1,6 @@ -apply plugin: "otel.java-conventions" +plugins { + id("otel.java-conventions") +} dependencies { // For testing javaagent-bootstrap's Caffeine patch, we need to compile against our cache API diff --git a/javaagent-bootstrap/javaagent-bootstrap.gradle b/javaagent-bootstrap/javaagent-bootstrap.gradle index 48a9bd1483..a63495ab77 100644 --- a/javaagent-bootstrap/javaagent-bootstrap.gradle +++ b/javaagent-bootstrap/javaagent-bootstrap.gradle @@ -1,7 +1,9 @@ -group = 'io.opentelemetry.javaagent' +plugins { + id("otel.java-conventions") + id("otel.publish-conventions") +} -apply plugin: "otel.java-conventions" -apply plugin: "otel.publish-conventions" +group = 'io.opentelemetry.javaagent' // patch inner class from Caffeine to avoid ForkJoinTask from being loaded too early sourceSets { diff --git a/javaagent-exporters/javaagent-exporters.gradle b/javaagent-exporters/javaagent-exporters.gradle index c862ca0ce6..d9b5c34b85 100644 --- a/javaagent-exporters/javaagent-exporters.gradle +++ b/javaagent-exporters/javaagent-exporters.gradle @@ -1,8 +1,8 @@ // Project to collect and shade exporter dependencies included in the agent's full distribution. plugins { - id "otel.java-conventions" - id "otel.shadow-conventions" + id("otel.java-conventions") + id("otel.shadow-conventions") } dependencies { diff --git a/javaagent-extension-api/javaagent-extension-api.gradle b/javaagent-extension-api/javaagent-extension-api.gradle index ae205436f5..2ff9ee7758 100644 --- a/javaagent-extension-api/javaagent-extension-api.gradle +++ b/javaagent-extension-api/javaagent-extension-api.gradle @@ -1,7 +1,9 @@ -group = 'io.opentelemetry.javaagent' +plugins { + id("otel.java-conventions") + id("otel.publish-conventions") +} -apply plugin: "otel.java-conventions" -apply plugin: "otel.publish-conventions" +group = 'io.opentelemetry.javaagent' configurations { // classpath used by the instrumentation muzzle plugin diff --git a/javaagent-tooling/javaagent-tooling.gradle b/javaagent-tooling/javaagent-tooling.gradle index bfca99a434..a87d1060c4 100644 --- a/javaagent-tooling/javaagent-tooling.gradle +++ b/javaagent-tooling/javaagent-tooling.gradle @@ -1,7 +1,9 @@ -group = 'io.opentelemetry.javaagent' +plugins { + id("otel.java-conventions") + id("otel.publish-conventions") +} -apply plugin: "otel.java-conventions" -apply plugin: "otel.publish-conventions" +group = 'io.opentelemetry.javaagent' configurations { // classpath used by the instrumentation muzzle plugin diff --git a/javaagent/javaagent.gradle b/javaagent/javaagent.gradle index c2026909fb..2c4315d31b 100644 --- a/javaagent/javaagent.gradle +++ b/javaagent/javaagent.gradle @@ -5,15 +5,15 @@ import com.github.jk1.license.render.InventoryMarkdownReportRenderer plugins { id "otel.shadow-conventions" id "com.github.jk1.dependency-license-report" version "1.16" + + id("otel.java-conventions") + id("otel.publish-conventions") } description = 'OpenTelemetry Javaagent' group = 'io.opentelemetry.javaagent' -apply plugin: "otel.java-conventions" -apply plugin: "otel.publish-conventions" - configurations { shadowInclude { canBeResolved = true diff --git a/opentelemetry-api-shaded-for-instrumenting/opentelemetry-api-shaded-for-instrumenting.gradle b/opentelemetry-api-shaded-for-instrumenting/opentelemetry-api-shaded-for-instrumenting.gradle index faad7dd456..fa62d47453 100644 --- a/opentelemetry-api-shaded-for-instrumenting/opentelemetry-api-shaded-for-instrumenting.gradle +++ b/opentelemetry-api-shaded-for-instrumenting/opentelemetry-api-shaded-for-instrumenting.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") +} dependencies { implementation "io.opentelemetry:opentelemetry-api" diff --git a/opentelemetry-ext-annotations-shaded-for-instrumenting/opentelemetry-ext-annotations-shaded-for-instrumenting.gradle b/opentelemetry-ext-annotations-shaded-for-instrumenting/opentelemetry-ext-annotations-shaded-for-instrumenting.gradle index a00d1c1f47..0801b06411 100644 --- a/opentelemetry-ext-annotations-shaded-for-instrumenting/opentelemetry-ext-annotations-shaded-for-instrumenting.gradle +++ b/opentelemetry-ext-annotations-shaded-for-instrumenting/opentelemetry-ext-annotations-shaded-for-instrumenting.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") +} dependencies { implementation "io.opentelemetry:opentelemetry-extension-annotations" diff --git a/settings.gradle b/settings.gradle index 587f44f430..ef802a239d 100644 --- a/settings.gradle +++ b/settings.gradle @@ -36,8 +36,6 @@ gradleEnterprise { } } -apply plugin: 'com.github.burrunan.s3-build-cache' - def awsAccessKeyId = System.getenv("S3_BUILD_CACHE_ACCESS_KEY_ID") buildCache { diff --git a/smoke-tests/smoke-tests.gradle b/smoke-tests/smoke-tests.gradle index c1ac72bea6..4b9b02eba7 100644 --- a/smoke-tests/smoke-tests.gradle +++ b/smoke-tests/smoke-tests.gradle @@ -1,6 +1,8 @@ import java.time.Duration -apply plugin: "otel.java-conventions" +plugins { + id("otel.java-conventions") +} description = 'smoke-tests' diff --git a/testing-common/library-for-integration-tests/library-for-integration-tests.gradle b/testing-common/library-for-integration-tests/library-for-integration-tests.gradle index 8b761a00dc..0a3932d242 100644 --- a/testing-common/library-for-integration-tests/library-for-integration-tests.gradle +++ b/testing-common/library-for-integration-tests/library-for-integration-tests.gradle @@ -1 +1,3 @@ -apply plugin: "otel.java-conventions" +plugins { + id("otel.java-conventions") +} diff --git a/testing-common/testing-common.gradle b/testing-common/testing-common.gradle index d55792573f..b32f26fe63 100644 --- a/testing-common/testing-common.gradle +++ b/testing-common/testing-common.gradle @@ -1,9 +1,11 @@ +plugins { + id("otel.java-conventions") + id("otel.publish-conventions") +} + description = 'OpenTelemetry Javaagent testing commons' group = 'io.opentelemetry.javaagent' -apply plugin: "otel.java-conventions" -apply plugin: "otel.publish-conventions" - dependencies { api "org.codehaus.groovy:groovy-all" api "org.spockframework:spock-core" diff --git a/testing/agent-exporter/agent-exporter.gradle b/testing/agent-exporter/agent-exporter.gradle index 886454da82..8ae75cd981 100644 --- a/testing/agent-exporter/agent-exporter.gradle +++ b/testing/agent-exporter/agent-exporter.gradle @@ -1,8 +1,8 @@ plugins { - id "otel.shadow-conventions" -} + id("otel.shadow-conventions") -apply plugin: "otel.java-conventions" + id("otel.java-conventions") +} dependencies { compileOnly("net.bytebuddy:byte-buddy") diff --git a/testing/agent-for-testing/agent-for-testing.gradle b/testing/agent-for-testing/agent-for-testing.gradle index c9250f1c15..52e760ccea 100644 --- a/testing/agent-for-testing/agent-for-testing.gradle +++ b/testing/agent-for-testing/agent-for-testing.gradle @@ -1,13 +1,13 @@ plugins { - id "otel.shadow-conventions" + id("otel.shadow-conventions") + + id("otel.java-conventions") + id("otel.publish-conventions") } description = 'OpenTelemetry Javaagent for testing' group = 'io.opentelemetry.javaagent' -apply plugin: "otel.java-conventions" -apply plugin: "otel.publish-conventions" - jar { manifest { attributes( diff --git a/testing/armeria-shaded-for-testing/armeria-shaded-for-testing.gradle b/testing/armeria-shaded-for-testing/armeria-shaded-for-testing.gradle index 140c76b5d6..b8ad4b3fd1 100644 --- a/testing/armeria-shaded-for-testing/armeria-shaded-for-testing.gradle +++ b/testing/armeria-shaded-for-testing/armeria-shaded-for-testing.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.javaagent' -apply plugin: "otel.java-conventions" -apply plugin: "otel.publish-conventions" - dependencies { implementation("com.linecorp.armeria:armeria-junit5:1.8.0") { // We don't use JSON features of Armeria but shading it in can cause version conflicts with