diff --git a/gradle/instrumentation.gradle b/gradle/instrumentation.gradle index 7d852d4fca..53cc885c5c 100644 --- a/gradle/instrumentation.gradle +++ b/gradle/instrumentation.gradle @@ -6,7 +6,6 @@ apply plugin: 'muzzle' apply plugin: 'com.github.johnrengelman.shadow' ext { - packageInAgentBundle = true mavenGroupId = 'io.opentelemetry.javaagent.instrumentation' // Shadow is only for testing, not publishing. noShadowPublish = true diff --git a/instrumentation/cdi-testing/cdi-testing.gradle b/instrumentation/cdi-testing/cdi-testing.gradle index cd4de36508..7daa76e3f8 100644 --- a/instrumentation/cdi-testing/cdi-testing.gradle +++ b/instrumentation/cdi-testing/cdi-testing.gradle @@ -1,4 +1,6 @@ -ext.skipPublish = true +ext { + skipPublish = true +} apply from: "$rootDir/gradle/instrumentation.gradle" dependencies { diff --git a/instrumentation/classloaders/javaagent/jboss-testing/jboss-testing.gradle b/instrumentation/classloaders/javaagent/jboss-testing/jboss-testing.gradle index 64c5c19492..de026170f0 100644 --- a/instrumentation/classloaders/javaagent/jboss-testing/jboss-testing.gradle +++ b/instrumentation/classloaders/javaagent/jboss-testing/jboss-testing.gradle @@ -1,4 +1,6 @@ -ext.skipPublish = true +ext { + skipPublish = true +} apply from: "$rootDir/gradle/instrumentation.gradle" dependencies { diff --git a/instrumentation/classloaders/javaagent/osgi-testing/osgi-testing.gradle b/instrumentation/classloaders/javaagent/osgi-testing/osgi-testing.gradle index 2a7b747cfb..d0f02d1091 100644 --- a/instrumentation/classloaders/javaagent/osgi-testing/osgi-testing.gradle +++ b/instrumentation/classloaders/javaagent/osgi-testing/osgi-testing.gradle @@ -1,4 +1,6 @@ -ext.skipPublish = true +ext { + skipPublish = true +} apply from: "$rootDir/gradle/instrumentation.gradle" dependencies { diff --git a/instrumentation/classloaders/javaagent/tomcat-testing/tomcat-testing.gradle b/instrumentation/classloaders/javaagent/tomcat-testing/tomcat-testing.gradle index 43a49153c4..f4c906bf7a 100644 --- a/instrumentation/classloaders/javaagent/tomcat-testing/tomcat-testing.gradle +++ b/instrumentation/classloaders/javaagent/tomcat-testing/tomcat-testing.gradle @@ -1,5 +1,6 @@ -ext.skipPublish = true - +ext { + skipPublish = true +} apply from: "$rootDir/gradle/instrumentation.gradle" muzzle { 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 c91a51e097..c32976a313 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 @@ -12,7 +12,9 @@ muzzle { } dependencies { - implementation group: "com.couchbase.client", name: "tracing-opentelemetry", version: "0.3.3" + implementation(group: "com.couchbase.client", name: "tracing-opentelemetry", version: "0.3.3") { + exclude(group: "com.couchbase.client", module: "core-io") + } library group: "com.couchbase.client", name: "core-io", version: "2.1.0" diff --git a/instrumentation/couchbase/couchbase-3.1/javaagent/src/test/groovy/CouchbaseClient31Test.groovy b/instrumentation/couchbase/couchbase-3.1/javaagent/src/test/groovy/CouchbaseClient31Test.groovy index 729a6330cb..e0072b2a3d 100644 --- a/instrumentation/couchbase/couchbase-3.1/javaagent/src/test/groovy/CouchbaseClient31Test.groovy +++ b/instrumentation/couchbase/couchbase-3.1/javaagent/src/test/groovy/CouchbaseClient31Test.groovy @@ -62,7 +62,7 @@ class CouchbaseClient31Test extends AgentInstrumentationSpecification { name(~/.*get/) } span(1) { - name("dispatch_to_server") + name(~/.*dispatch_to_server/) } } } diff --git a/instrumentation/dropwizard-testing/dropwizard-testing.gradle b/instrumentation/dropwizard-testing/dropwizard-testing.gradle index 36a17ea0ca..cb3b867d80 100644 --- a/instrumentation/dropwizard-testing/dropwizard-testing.gradle +++ b/instrumentation/dropwizard-testing/dropwizard-testing.gradle @@ -1,4 +1,6 @@ -ext.skipPublish = true +ext { + skipPublish = true +} apply from: "$rootDir/gradle/instrumentation.gradle" dependencies { diff --git a/instrumentation/instrumentation.gradle b/instrumentation/instrumentation.gradle index e79d7f0c4f..cefdc19bd6 100644 --- a/instrumentation/instrumentation.gradle +++ b/instrumentation/instrumentation.gradle @@ -24,7 +24,7 @@ subprojects { // Make it so all instrumentation subproject tests can be run with a single command. instr_project.tasks.test.dependsOn(subProj.tasks.test) - if (subProj.findProperty('packageInAgentBundle')) { + if (subProj.name == 'javaagent') { instr_project.dependencies { implementation(project(subProj.getPath())) } diff --git a/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-wildfly-testing/jaxrs-2.0-wildfly-testing.gradle b/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-wildfly-testing/jaxrs-2.0-wildfly-testing.gradle index 205a92c683..9dfd6a6fee 100644 --- a/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-wildfly-testing/jaxrs-2.0-wildfly-testing.gradle +++ b/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-wildfly-testing/jaxrs-2.0-wildfly-testing.gradle @@ -1,4 +1,6 @@ -ext.skipPublish = true +ext { + skipPublish = true +} apply from: "$rootDir/gradle/instrumentation.gradle" configurations { @@ -6,7 +8,7 @@ configurations { } dependencies { - api "javax:javaee-api:7.0" + testImplementation "javax:javaee-api:7.0" def arquillianVersion = '1.4.0.Final' testImplementation "org.jboss.arquillian.junit:arquillian-junit-container:${arquillianVersion}" diff --git a/instrumentation/mongo/mongo-4.0-testing/mongo-4.0-testing.gradle b/instrumentation/mongo/mongo-4.0-testing/mongo-4.0-testing.gradle index 5c182f758b..d5f197d996 100644 --- a/instrumentation/mongo/mongo-4.0-testing/mongo-4.0-testing.gradle +++ b/instrumentation/mongo/mongo-4.0-testing/mongo-4.0-testing.gradle @@ -1,7 +1,8 @@ +ext { + skipPublish = true +} apply from: "$rootDir/gradle/instrumentation.gradle" - - dependencies { testInstrumentation(project(':instrumentation:mongo:mongo-3.7:javaagent')) { exclude group: 'org.mongodb', module: 'mongo-java-driver' diff --git a/instrumentation/servlet/glassfish-testing/glassfish-testing.gradle b/instrumentation/servlet/glassfish-testing/glassfish-testing.gradle index 714b5a3796..65bed64a6c 100644 --- a/instrumentation/servlet/glassfish-testing/glassfish-testing.gradle +++ b/instrumentation/servlet/glassfish-testing/glassfish-testing.gradle @@ -5,7 +5,6 @@ ext { apply from: "$rootDir/gradle/instrumentation.gradle" - dependencies { testInstrumentation project(':instrumentation:servlet:servlet-3.0:javaagent') testInstrumentation project(':instrumentation:servlet:servlet-common:javaagent') diff --git a/javaagent-tooling/javaagent-tooling.gradle b/javaagent-tooling/javaagent-tooling.gradle index e0403d43c3..48ada9a2fd 100644 --- a/javaagent-tooling/javaagent-tooling.gradle +++ b/javaagent-tooling/javaagent-tooling.gradle @@ -28,12 +28,7 @@ dependencies { implementation deps.opentelemetrySdk implementation deps.opentelemetrySdkAutoconfigure implementation deps.opentelemetrySdkMetrics - implementation(deps.opentelemetryKotlin) { - // opentelemetry-extension-kotlin classes are injected into user classpath - // where kotlin core libraries are already present - exclude group: 'org.jetbrains.kotlin', module: 'kotlin-stdlib-common' - exclude group: 'org.jetbrains.kotlinx', module: 'kotlinx-coroutines-core' - } + implementation(deps.opentelemetryKotlin) implementation deps.opentelemetryExtAws implementation deps.opentelemetryTraceProps implementation(deps.opentelemetryResources) {