diff --git a/instrumentation/classloaders/javaagent/classloaders-javaagent.gradle b/instrumentation/internal/internal-class-loader/javaagent/internal-class-loader-javaagent.gradle similarity index 100% rename from instrumentation/classloaders/javaagent/classloaders-javaagent.gradle rename to instrumentation/internal/internal-class-loader/javaagent/internal-class-loader-javaagent.gradle diff --git a/instrumentation/classloaders/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/javaclassloader/ClassLoaderInstrumentation.java b/instrumentation/internal/internal-class-loader/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/internal/classloader/ClassLoaderInstrumentation.java similarity index 98% rename from instrumentation/classloaders/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/javaclassloader/ClassLoaderInstrumentation.java rename to instrumentation/internal/internal-class-loader/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/internal/classloader/ClassLoaderInstrumentation.java index 6e1fceabf0..8bc05c74ae 100644 --- a/instrumentation/classloaders/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/javaclassloader/ClassLoaderInstrumentation.java +++ b/instrumentation/internal/internal-class-loader/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/internal/classloader/ClassLoaderInstrumentation.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.javaagent.instrumentation.javaclassloader; +package io.opentelemetry.javaagent.instrumentation.internal.classloader; import static io.opentelemetry.javaagent.tooling.bytebuddy.matcher.AgentElementMatchers.extendsClass; import static io.opentelemetry.javaagent.tooling.bytebuddy.matcher.NameMatchers.namedNoneOf; diff --git a/instrumentation/classloaders/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/javaclassloader/ClassLoaderInstrumentationModule.java b/instrumentation/internal/internal-class-loader/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/internal/classloader/ClassLoaderInstrumentationModule.java similarity index 71% rename from instrumentation/classloaders/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/javaclassloader/ClassLoaderInstrumentationModule.java rename to instrumentation/internal/internal-class-loader/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/internal/classloader/ClassLoaderInstrumentationModule.java index ecf970784e..c88faac005 100644 --- a/instrumentation/classloaders/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/javaclassloader/ClassLoaderInstrumentationModule.java +++ b/instrumentation/internal/internal-class-loader/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/internal/classloader/ClassLoaderInstrumentationModule.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.javaagent.instrumentation.javaclassloader; +package io.opentelemetry.javaagent.instrumentation.internal.classloader; import static java.util.Arrays.asList; @@ -15,7 +15,7 @@ import java.util.List; @AutoService(InstrumentationModule.class) public class ClassLoaderInstrumentationModule extends InstrumentationModule { public ClassLoaderInstrumentationModule() { - super("classloader"); + super("internal-class-loader"); } @Override @@ -25,10 +25,6 @@ public class ClassLoaderInstrumentationModule extends InstrumentationModule { @Override public List typeInstrumentations() { - return asList( - new ClassLoaderInstrumentation(), - new UrlClassLoaderInstrumentation(), - new ProxyInstrumentation(), - new ResourceInjectionInstrumentation()); + return asList(new ClassLoaderInstrumentation(), new ResourceInjectionInstrumentation()); } } diff --git a/instrumentation/classloaders/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/javaclassloader/ResourceInjectionInstrumentation.java b/instrumentation/internal/internal-class-loader/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/internal/classloader/ResourceInjectionInstrumentation.java similarity index 97% rename from instrumentation/classloaders/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/javaclassloader/ResourceInjectionInstrumentation.java rename to instrumentation/internal/internal-class-loader/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/internal/classloader/ResourceInjectionInstrumentation.java index 34ed6c2044..a1b64f3f86 100644 --- a/instrumentation/classloaders/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/javaclassloader/ResourceInjectionInstrumentation.java +++ b/instrumentation/internal/internal-class-loader/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/internal/classloader/ResourceInjectionInstrumentation.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.javaagent.instrumentation.javaclassloader; +package io.opentelemetry.javaagent.instrumentation.internal.classloader; import static io.opentelemetry.javaagent.tooling.bytebuddy.matcher.AgentElementMatchers.extendsClass; import static net.bytebuddy.matcher.ElementMatchers.isMethod; diff --git a/instrumentation/classloaders/javaagent/src/test/groovy/ClassLoadingTest.groovy b/instrumentation/internal/internal-class-loader/javaagent/src/test/groovy/ClassLoadingTest.groovy similarity index 100% rename from instrumentation/classloaders/javaagent/src/test/groovy/ClassLoadingTest.groovy rename to instrumentation/internal/internal-class-loader/javaagent/src/test/groovy/ClassLoadingTest.groovy diff --git a/instrumentation/classloaders/javaagent/src/test/groovy/JBossClassloadingTest.groovy b/instrumentation/internal/internal-class-loader/javaagent/src/test/groovy/JBossClassloadingTest.groovy similarity index 100% rename from instrumentation/classloaders/javaagent/src/test/groovy/JBossClassloadingTest.groovy rename to instrumentation/internal/internal-class-loader/javaagent/src/test/groovy/JBossClassloadingTest.groovy diff --git a/instrumentation/classloaders/javaagent/src/test/groovy/OSGIClassloadingTest.groovy b/instrumentation/internal/internal-class-loader/javaagent/src/test/groovy/OSGIClassloadingTest.groovy similarity index 100% rename from instrumentation/classloaders/javaagent/src/test/groovy/OSGIClassloadingTest.groovy rename to instrumentation/internal/internal-class-loader/javaagent/src/test/groovy/OSGIClassloadingTest.groovy diff --git a/instrumentation/classloaders/javaagent/src/test/groovy/ResourceInjectionTest.groovy b/instrumentation/internal/internal-class-loader/javaagent/src/test/groovy/ResourceInjectionTest.groovy similarity index 100% rename from instrumentation/classloaders/javaagent/src/test/groovy/ResourceInjectionTest.groovy rename to instrumentation/internal/internal-class-loader/javaagent/src/test/groovy/ResourceInjectionTest.groovy diff --git a/instrumentation/classloaders/javaagent/src/test/groovy/TomcatClassloadingTest.groovy b/instrumentation/internal/internal-class-loader/javaagent/src/test/groovy/TomcatClassloadingTest.groovy similarity index 100% rename from instrumentation/classloaders/javaagent/src/test/groovy/TomcatClassloadingTest.groovy rename to instrumentation/internal/internal-class-loader/javaagent/src/test/groovy/TomcatClassloadingTest.groovy diff --git a/instrumentation/classloaders/javaagent/src/test/resources/test-resources/test-resource.txt b/instrumentation/internal/internal-class-loader/javaagent/src/test/resources/test-resources/test-resource.txt similarity index 100% rename from instrumentation/classloaders/javaagent/src/test/resources/test-resources/test-resource.txt rename to instrumentation/internal/internal-class-loader/javaagent/src/test/resources/test-resources/test-resource.txt diff --git a/instrumentation/classloaders/javaagent-unit-tests/classloaders-javaagent-unit-tests.gradle b/instrumentation/internal/internal-proxy/javaagent-unit-tests/internal-proxy-javaagent-unit-tests.gradle similarity index 57% rename from instrumentation/classloaders/javaagent-unit-tests/classloaders-javaagent-unit-tests.gradle rename to instrumentation/internal/internal-proxy/javaagent-unit-tests/internal-proxy-javaagent-unit-tests.gradle index 03763b8947..cbca11de1f 100644 --- a/instrumentation/classloaders/javaagent-unit-tests/classloaders-javaagent-unit-tests.gradle +++ b/instrumentation/internal/internal-proxy/javaagent-unit-tests/internal-proxy-javaagent-unit-tests.gradle @@ -1,6 +1,6 @@ apply from: "$rootDir/gradle/java.gradle" dependencies { - testImplementation project(':instrumentation:classloaders:javaagent') + testImplementation project(':instrumentation:internal:internal-proxy:javaagent') testImplementation project(':javaagent-bootstrap') } diff --git a/instrumentation/classloaders/javaagent-unit-tests/src/test/groovy/ProxyHelperTest.groovy b/instrumentation/internal/internal-proxy/javaagent-unit-tests/src/test/groovy/ProxyHelperTest.groovy similarity index 95% rename from instrumentation/classloaders/javaagent-unit-tests/src/test/groovy/ProxyHelperTest.groovy rename to instrumentation/internal/internal-proxy/javaagent-unit-tests/src/test/groovy/ProxyHelperTest.groovy index 4025624b6a..9a2be5ae0d 100644 --- a/instrumentation/classloaders/javaagent-unit-tests/src/test/groovy/ProxyHelperTest.groovy +++ b/instrumentation/internal/internal-proxy/javaagent-unit-tests/src/test/groovy/ProxyHelperTest.groovy @@ -4,7 +4,7 @@ */ import io.opentelemetry.javaagent.bootstrap.FieldBackedContextStoreAppliedMarker -import io.opentelemetry.javaagent.instrumentation.javaclassloader.ProxyHelper +import io.opentelemetry.javaagent.instrumentation.internal.proxy.ProxyHelper import java.util.concurrent.Callable import spock.lang.Specification diff --git a/instrumentation/internal/internal-proxy/javaagent/internal-proxy-javaagent.gradle b/instrumentation/internal/internal-proxy/javaagent/internal-proxy-javaagent.gradle new file mode 100644 index 0000000000..27dd8c324c --- /dev/null +++ b/instrumentation/internal/internal-proxy/javaagent/internal-proxy-javaagent.gradle @@ -0,0 +1,28 @@ +apply from: "$rootDir/gradle/instrumentation.gradle" + +dependencies { + compileOnly project(':javaagent-bootstrap') + + testImplementation project(':javaagent-bootstrap') + + // This is the earliest version that has org.apache.catalina.loader.ParallelWebappClassLoader + // which is used in the test + testLibrary group: 'org.apache.tomcat', name: 'tomcat-catalina', version: '8.0.14' + + testImplementation group: 'org.jboss.modules', name: 'jboss-modules', version: '1.3.10.Final' + + // TODO: we should separate core and Eclipse tests at some point, + // but right now core-specific tests are quite dumb and are run with + // core version provided by Eclipse implementation. + //testImplementation group: 'org.osgi', name: 'org.osgi.core', version: '4.0.0' + testImplementation group: 'org.eclipse.platform', name: 'org.eclipse.osgi', version: '3.13.200' + testImplementation group: 'org.apache.felix', name: 'org.apache.felix.framework', version: '6.0.2' +} + +// TODO (trask) ResourceInjectionTest is sort of hybrid integration/unit test +// maybe cleaner turning it into integration test with its own test instrumentation, +// similar to :testing-common:integration-tests +// then wouldn't need this shadowJar and wouldn't need HelperInjectorAccess +shadowJar { + from("src/test/resources/") +} \ No newline at end of file diff --git a/instrumentation/classloaders/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/javaclassloader/ProxyHelper.java b/instrumentation/internal/internal-proxy/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/internal/proxy/ProxyHelper.java similarity index 93% rename from instrumentation/classloaders/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/javaclassloader/ProxyHelper.java rename to instrumentation/internal/internal-proxy/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/internal/proxy/ProxyHelper.java index 0c1fa5ec99..d0794a12a0 100644 --- a/instrumentation/classloaders/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/javaclassloader/ProxyHelper.java +++ b/instrumentation/internal/internal-proxy/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/internal/proxy/ProxyHelper.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.javaagent.instrumentation.javaclassloader; +package io.opentelemetry.javaagent.instrumentation.internal.proxy; import io.opentelemetry.javaagent.bootstrap.FieldBackedContextStoreAppliedMarker; import java.util.Arrays; diff --git a/instrumentation/classloaders/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/javaclassloader/ProxyInstrumentation.java b/instrumentation/internal/internal-proxy/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/internal/proxy/ProxyInstrumentation.java similarity index 97% rename from instrumentation/classloaders/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/javaclassloader/ProxyInstrumentation.java rename to instrumentation/internal/internal-proxy/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/internal/proxy/ProxyInstrumentation.java index f026d38432..50c18aa92b 100644 --- a/instrumentation/classloaders/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/javaclassloader/ProxyInstrumentation.java +++ b/instrumentation/internal/internal-proxy/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/internal/proxy/ProxyInstrumentation.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.javaagent.instrumentation.javaclassloader; +package io.opentelemetry.javaagent.instrumentation.internal.proxy; import static net.bytebuddy.matcher.ElementMatchers.isMethod; import static net.bytebuddy.matcher.ElementMatchers.isPublic; diff --git a/instrumentation/internal/internal-proxy/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/internal/proxy/ProxyInstrumentationModule.java b/instrumentation/internal/internal-proxy/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/internal/proxy/ProxyInstrumentationModule.java new file mode 100644 index 0000000000..48dcaabacd --- /dev/null +++ b/instrumentation/internal/internal-proxy/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/internal/proxy/ProxyInstrumentationModule.java @@ -0,0 +1,25 @@ +/* + * Copyright The OpenTelemetry Authors + * SPDX-License-Identifier: Apache-2.0 + */ + +package io.opentelemetry.javaagent.instrumentation.internal.proxy; + +import static java.util.Collections.singletonList; + +import com.google.auto.service.AutoService; +import io.opentelemetry.javaagent.tooling.InstrumentationModule; +import io.opentelemetry.javaagent.tooling.TypeInstrumentation; +import java.util.List; + +@AutoService(InstrumentationModule.class) +public class ProxyInstrumentationModule extends InstrumentationModule { + public ProxyInstrumentationModule() { + super("internal-proxy"); + } + + @Override + public List typeInstrumentations() { + return singletonList(new ProxyInstrumentation()); + } +} diff --git a/instrumentation/classloaders/javaagent/src/test/groovy/NewProxyInstanceTest.groovy b/instrumentation/internal/internal-proxy/javaagent/src/test/groovy/NewProxyInstanceTest.groovy similarity index 100% rename from instrumentation/classloaders/javaagent/src/test/groovy/NewProxyInstanceTest.groovy rename to instrumentation/internal/internal-proxy/javaagent/src/test/groovy/NewProxyInstanceTest.groovy diff --git a/instrumentation/classloaders/javaagent-integration-tests/javaagent-integration-tests.gradle b/instrumentation/internal/internal-url-class-loader/javaagent-integration-tests/internal-url-class-loader-javaagent-integration-tests.gradle similarity index 73% rename from instrumentation/classloaders/javaagent-integration-tests/javaagent-integration-tests.gradle rename to instrumentation/internal/internal-url-class-loader/javaagent-integration-tests/internal-url-class-loader-javaagent-integration-tests.gradle index e1468e37b3..52a48d6326 100644 --- a/instrumentation/classloaders/javaagent-integration-tests/javaagent-integration-tests.gradle +++ b/instrumentation/internal/internal-url-class-loader/javaagent-integration-tests/internal-url-class-loader-javaagent-integration-tests.gradle @@ -5,4 +5,6 @@ apply from: "$rootDir/gradle/instrumentation.gradle" dependencies { testImplementation group: "org.apache.commons", name: "commons-lang3", version: "3.12.0" testImplementation group: "commons-io", name: "commons-io", version: "2.8.0" + + testInstrumentation project(":instrumentation:internal:internal-url-class-loader:javaagent") } diff --git a/instrumentation/classloaders/javaagent-integration-tests/src/main/java/instrumentation/TestInstrumentationModule.java b/instrumentation/internal/internal-url-class-loader/javaagent-integration-tests/src/main/java/instrumentation/TestInstrumentationModule.java similarity index 100% rename from instrumentation/classloaders/javaagent-integration-tests/src/main/java/instrumentation/TestInstrumentationModule.java rename to instrumentation/internal/internal-url-class-loader/javaagent-integration-tests/src/main/java/instrumentation/TestInstrumentationModule.java diff --git a/instrumentation/classloaders/javaagent-integration-tests/src/test/groovy/AddUrlTest.groovy b/instrumentation/internal/internal-url-class-loader/javaagent-integration-tests/src/test/groovy/AddUrlTest.groovy similarity index 100% rename from instrumentation/classloaders/javaagent-integration-tests/src/test/groovy/AddUrlTest.groovy rename to instrumentation/internal/internal-url-class-loader/javaagent-integration-tests/src/test/groovy/AddUrlTest.groovy 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 new file mode 100644 index 0000000000..27dd8c324c --- /dev/null +++ b/instrumentation/internal/internal-url-class-loader/javaagent/internal-url-class-loader-javaagent.gradle @@ -0,0 +1,28 @@ +apply from: "$rootDir/gradle/instrumentation.gradle" + +dependencies { + compileOnly project(':javaagent-bootstrap') + + testImplementation project(':javaagent-bootstrap') + + // This is the earliest version that has org.apache.catalina.loader.ParallelWebappClassLoader + // which is used in the test + testLibrary group: 'org.apache.tomcat', name: 'tomcat-catalina', version: '8.0.14' + + testImplementation group: 'org.jboss.modules', name: 'jboss-modules', version: '1.3.10.Final' + + // TODO: we should separate core and Eclipse tests at some point, + // but right now core-specific tests are quite dumb and are run with + // core version provided by Eclipse implementation. + //testImplementation group: 'org.osgi', name: 'org.osgi.core', version: '4.0.0' + testImplementation group: 'org.eclipse.platform', name: 'org.eclipse.osgi', version: '3.13.200' + testImplementation group: 'org.apache.felix', name: 'org.apache.felix.framework', version: '6.0.2' +} + +// TODO (trask) ResourceInjectionTest is sort of hybrid integration/unit test +// maybe cleaner turning it into integration test with its own test instrumentation, +// similar to :testing-common:integration-tests +// then wouldn't need this shadowJar and wouldn't need HelperInjectorAccess +shadowJar { + from("src/test/resources/") +} \ No newline at end of file diff --git a/instrumentation/classloaders/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/javaclassloader/UrlClassLoaderInstrumentation.java b/instrumentation/internal/internal-url-class-loader/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/internal/urlclassloader/UrlClassLoaderInstrumentation.java similarity index 96% rename from instrumentation/classloaders/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/javaclassloader/UrlClassLoaderInstrumentation.java rename to instrumentation/internal/internal-url-class-loader/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/internal/urlclassloader/UrlClassLoaderInstrumentation.java index cde19dcb38..8bc4369a6c 100644 --- a/instrumentation/classloaders/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/javaclassloader/UrlClassLoaderInstrumentation.java +++ b/instrumentation/internal/internal-url-class-loader/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/internal/urlclassloader/UrlClassLoaderInstrumentation.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.javaagent.instrumentation.javaclassloader; +package io.opentelemetry.javaagent.instrumentation.internal.urlclassloader; import static java.util.Collections.singletonMap; import static net.bytebuddy.matcher.ElementMatchers.isMethod; diff --git a/instrumentation/internal/internal-url-class-loader/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/internal/urlclassloader/UrlClassLoaderInstrumentationModule.java b/instrumentation/internal/internal-url-class-loader/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/internal/urlclassloader/UrlClassLoaderInstrumentationModule.java new file mode 100644 index 0000000000..81a023295e --- /dev/null +++ b/instrumentation/internal/internal-url-class-loader/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/internal/urlclassloader/UrlClassLoaderInstrumentationModule.java @@ -0,0 +1,25 @@ +/* + * Copyright The OpenTelemetry Authors + * SPDX-License-Identifier: Apache-2.0 + */ + +package io.opentelemetry.javaagent.instrumentation.internal.urlclassloader; + +import static java.util.Collections.singletonList; + +import com.google.auto.service.AutoService; +import io.opentelemetry.javaagent.tooling.InstrumentationModule; +import io.opentelemetry.javaagent.tooling.TypeInstrumentation; +import java.util.List; + +@AutoService(InstrumentationModule.class) +public class UrlClassLoaderInstrumentationModule extends InstrumentationModule { + public UrlClassLoaderInstrumentationModule() { + super("internal-url-class-loader"); + } + + @Override + public List typeInstrumentations() { + return singletonList(new UrlClassLoaderInstrumentation()); + } +} diff --git a/settings.gradle b/settings.gradle index 27b1978f5a..d1d1bb712b 100644 --- a/settings.gradle +++ b/settings.gradle @@ -85,9 +85,11 @@ include ':instrumentation:aws-sdk:aws-sdk-2.2:testing' include ':instrumentation:cassandra:cassandra-3.0:javaagent' include ':instrumentation:cassandra:cassandra-4.0:javaagent' include ':instrumentation:cdi-testing' -include ':instrumentation:classloaders:javaagent' -include ':instrumentation:classloaders:javaagent-integration-tests' -include ':instrumentation:classloaders:javaagent-unit-tests' +include ':instrumentation:internal:internal-class-loader:javaagent' +include ':instrumentation:internal:internal-proxy:javaagent' +include ':instrumentation:internal:internal-proxy:javaagent-unit-tests' +include ':instrumentation:internal:internal-url-class-loader:javaagent' +include ':instrumentation:internal:internal-url-class-loader:javaagent-integration-tests' include ':instrumentation:couchbase:couchbase-2.0:javaagent' include ':instrumentation:couchbase:couchbase-2.0:javaagent-unit-tests' include ':instrumentation:couchbase:couchbase-2.6:javaagent' @@ -277,9 +279,12 @@ include ':benchmark-integration:jetty-perftest' include ':benchmark-e2e' def setBuildFile(project) { - // javaagent-unit-tests modules are needed until those projects have library modules - // at which time those unit tests can be moved to the library modules - if (['javaagent', 'javaagent-unit-tests', 'library', 'testing'].contains(project.projectDir.name) && project.path != ':javaagent') { + // javaagent-unittests modules are needed until those projects have library modules + // at which time those unittests can be moved to the library modules + // + // javaagent-integration-tests modules are only needed by "internal-" instrumentation + // which needs to be tested by creating some other "test" instrumentation + if (['javaagent', 'javaagent-unit-tests', 'javaagent-integration-tests', 'library', 'testing'].contains(project.projectDir.name) && project.path != ':javaagent') { project.buildFileName = "${project.projectDir.parentFile.name}-${project.projectDir.name}.gradle" } else { project.buildFileName = "${project.name}.gradle" diff --git a/testing/agent-exporter/agent-exporter.gradle b/testing/agent-exporter/agent-exporter.gradle index cd19cbe1a9..b7052cad02 100644 --- a/testing/agent-exporter/agent-exporter.gradle +++ b/testing/agent-exporter/agent-exporter.gradle @@ -24,7 +24,9 @@ dependencies { implementation project(':instrumentation:executors:javaagent') // FIXME: we should enable this, but currently this fails tests for google http client //testImplementation project(':instrumentation:http-url-connection:javaagent') - implementation project(':instrumentation:classloaders:javaagent') + implementation project(':instrumentation:internal:internal-class-loader:javaagent') + implementation project(':instrumentation:internal:internal-proxy:javaagent') + implementation project(':instrumentation:internal:internal-url-class-loader:javaagent') // Many tests use OpenTelemetry API calls, e.g., via TraceUtils.runUnderTrace implementation project(':instrumentation:opentelemetry-annotations-1.0:javaagent')