From 7172fae91aa9baf759d82db9c4fcdaa25c3b545a Mon Sep 17 00:00:00 2001 From: Trask Stalnaker Date: Thu, 21 Oct 2021 12:41:28 -0700 Subject: [PATCH] Move common testing modules to match convention a bit better(?) (#4451) * Rename jsf modules to match convention * Couchbase too * Mongo too * Play WS too * Log4j too * Elasticsearch too * JAX-RS too * JAX-WS sort of * Spotless * empty commit --- .../couchbase-2.0/javaagent/build.gradle.kts | 2 +- .../couchbase-2.6/javaagent/build.gradle.kts | 2 +- .../testing}/build.gradle.kts | 0 .../AbstractCouchbaseAsyncClientTest.groovy | 2 +- .../groovy/AbstractCouchbaseClientTest.groovy | 2 +- ...stractCouchbaseSpringRepositoryTest.groovy | 0 ...AbstractCouchbaseSpringTemplateTest.groovy | 4 ++-- .../groovy/springdata/CouchbaseConfig.groovy | 0 .../src/main/groovy/springdata/Doc.groovy | 0 .../groovy/springdata/DocRepository.groovy | 0 .../groovy/util/AbstractCouchbaseTest.groovy | 0 .../javaagent/build.gradle.kts | 2 +- .../javaagent/build.gradle.kts | 2 +- .../javaagent/build.gradle.kts | 2 +- .../testing}/build.gradle.kts | 0 .../AbstractElasticsearchClientTest.groovy | 0 ...AbstractElasticsearchNodeClientTest.groovy | 0 ...actElasticsearchTransportClientTest.groovy | 0 .../testing}/build.gradle.kts | 0 .../src/main/groovy/JaxRsFilterTest.groovy | 0 .../main/groovy/JaxRsHttpServerTest.groovy | 0 .../groovy/JaxRsJettyHttpServerTest.groovy | 2 +- ...JaxrsAnnotationsInstrumentationTest.groovy | 0 .../main/groovy/test/JaxRsTestResource.groovy | 0 .../src/main/java/JavaInterfaces.java | 0 .../testing}/src/main/java/Resource.java | 0 .../javaagent/build.gradle.kts | 2 +- .../javaagent/build.gradle.kts | 2 +- .../javaagent/build.gradle.kts | 2 +- .../javaagent/build.gradle.kts | 2 +- .../javaagent/build.gradle.kts | 2 +- .../build.gradle.kts | 0 .../src/main/groovy/AbstractJaxWsTest.groovy | 0 .../main/groovy/hello/BaseHelloService.groovy | 0 .../src/main/groovy/hello/HelloService.groovy | 0 .../main/groovy/hello/HelloServiceImpl.groovy | 0 .../src/main/schema/hello.xsd | 0 .../javaagent/build.gradle.kts | 2 +- .../javaagent/build.gradle.kts | 2 +- .../testing}/build.gradle.kts | 0 .../src/main/groovy/BaseJsfTest.groovy | 0 .../src/main/groovy/ExceptionFilter.groovy | 0 .../src/main/groovy/GreetingForm.groovy | 0 .../test-app-1.2/WEB-INF/faces-config.xml | 0 .../resources/test-app-1.2/WEB-INF/web.xml | 0 .../resources/test-app-1.2/greeting.xhtml | 0 .../main/resources/test-app-1.2/hello.xhtml | 0 .../test-app-2/WEB-INF/faces-config.xml | 0 .../main/resources/test-app-2/WEB-INF/web.xml | 0 .../main/resources/test-app-2/greeting.xhtml | 0 .../src/main/resources/test-app-2/hello.xhtml | 0 .../javaagent/build.gradle.kts | 2 +- .../ActionListenerImplInstrumentation.java | 0 .../mojarra/MojarraInstrumentationModule.java | 0 .../mojarra/MojarraSingletons.java | 0 .../RestoreViewPhaseInstrumentation.java | 0 .../mojarra12Test/groovy/Mojarra12Test.groovy | 0 .../META-INF/web-fragment.xml | 0 .../groovy/Mojarra2LatestTest.groovy | 0 .../mojarra2Test/groovy/Mojarra2Test.groovy | 0 .../javaagent/build.gradle.kts | 2 +- .../ActionListenerImplInstrumentation.java | 0 .../myfaces/MyFacesErrorCauseExtractor.java | 0 .../myfaces/MyFacesInstrumentationModule.java | 0 .../myfaces/MyFacesSingletons.java | 0 .../RestoreViewExecutorInstrumentation.java | 0 .../myfaces12Test/groovy/Myfaces12Test.groovy | 0 .../META-INF/web-fragment.xml | 0 .../groovy/Myfaces2LatestTest.groovy | 0 .../META-INF/web-fragment.xml | 0 .../myfaces2Test/groovy/Myfaces2Test.groovy | 0 .../META-INF/web-fragment.xml | 0 .../testing}/build.gradle.kts | 0 .../src/main/groovy/Log4j2Test.groovy | 0 .../log4j/v2_13_2/ListAppender.java | 0 .../src/main/resources/log4j2-test.xml | 0 .../log4j-2.13.2/javaagent/build.gradle.kts | 2 +- .../log4j-2.13.2/library/build.gradle.kts | 2 +- .../log4j-2.7/javaagent/build.gradle.kts | 2 +- .../mongo/mongo-3.1/testing/build.gradle.kts | 2 +- .../mongo-3.7/javaagent/build.gradle.kts | 2 +- .../mongo-4.0/javaagent/build.gradle.kts | 2 +- .../javaagent/build.gradle.kts | 2 +- .../testing}/build.gradle.kts | 0 .../testing/AbstractMongoClientTest.groovy | 0 .../play-ws-1.0/javaagent/build.gradle.kts | 2 +- .../play-ws-2.0/javaagent/build.gradle.kts | 2 +- .../play-ws-2.1/javaagent/build.gradle.kts | 2 +- .../testing}/build.gradle.kts | 0 .../main/groovy/PlayWsClientTestBase.groovy | 0 .../groovy/PlayWsClientTestBaseBase.groovy | 0 settings.gradle.kts | 20 +++++++++---------- 92 files changed, 39 insertions(+), 39 deletions(-) rename instrumentation/couchbase/{couchbase-testing => couchbase-common/testing}/build.gradle.kts (100%) rename instrumentation/couchbase/{couchbase-testing => couchbase-common/testing}/src/main/groovy/AbstractCouchbaseAsyncClientTest.groovy (97%) rename instrumentation/couchbase/{couchbase-testing => couchbase-common/testing}/src/main/groovy/AbstractCouchbaseClientTest.groovy (97%) rename instrumentation/couchbase/{couchbase-testing => couchbase-common/testing}/src/main/groovy/springdata/AbstractCouchbaseSpringRepositoryTest.groovy (100%) rename instrumentation/couchbase/{couchbase-testing => couchbase-common/testing}/src/main/groovy/springdata/AbstractCouchbaseSpringTemplateTest.groovy (96%) rename instrumentation/couchbase/{couchbase-testing => couchbase-common/testing}/src/main/groovy/springdata/CouchbaseConfig.groovy (100%) rename instrumentation/couchbase/{couchbase-testing => couchbase-common/testing}/src/main/groovy/springdata/Doc.groovy (100%) rename instrumentation/couchbase/{couchbase-testing => couchbase-common/testing}/src/main/groovy/springdata/DocRepository.groovy (100%) rename instrumentation/couchbase/{couchbase-testing => couchbase-common/testing}/src/main/groovy/util/AbstractCouchbaseTest.groovy (100%) rename instrumentation/elasticsearch/{elasticsearch-transport-testing => elasticsearch-transport-common/testing}/build.gradle.kts (100%) rename instrumentation/elasticsearch/{elasticsearch-transport-testing => elasticsearch-transport-common/testing}/src/main/groovy/AbstractElasticsearchClientTest.groovy (100%) rename instrumentation/elasticsearch/{elasticsearch-transport-testing => elasticsearch-transport-common/testing}/src/main/groovy/AbstractElasticsearchNodeClientTest.groovy (100%) rename instrumentation/elasticsearch/{elasticsearch-transport-testing => elasticsearch-transport-common/testing}/src/main/groovy/AbstractElasticsearchTransportClientTest.groovy (100%) rename instrumentation/jaxrs/jaxrs-2.0/{jaxrs-2.0-testing => jaxrs-2.0-common/testing}/build.gradle.kts (100%) rename instrumentation/jaxrs/jaxrs-2.0/{jaxrs-2.0-testing => jaxrs-2.0-common/testing}/src/main/groovy/JaxRsFilterTest.groovy (100%) rename instrumentation/jaxrs/jaxrs-2.0/{jaxrs-2.0-testing => jaxrs-2.0-common/testing}/src/main/groovy/JaxRsHttpServerTest.groovy (100%) rename instrumentation/jaxrs/jaxrs-2.0/{jaxrs-2.0-testing => jaxrs-2.0-common/testing}/src/main/groovy/JaxRsJettyHttpServerTest.groovy (91%) rename instrumentation/jaxrs/jaxrs-2.0/{jaxrs-2.0-testing => jaxrs-2.0-common/testing}/src/main/groovy/JaxrsAnnotationsInstrumentationTest.groovy (100%) rename instrumentation/jaxrs/jaxrs-2.0/{jaxrs-2.0-testing => jaxrs-2.0-common/testing}/src/main/groovy/test/JaxRsTestResource.groovy (100%) rename instrumentation/jaxrs/jaxrs-2.0/{jaxrs-2.0-testing => jaxrs-2.0-common/testing}/src/main/java/JavaInterfaces.java (100%) rename instrumentation/jaxrs/jaxrs-2.0/{jaxrs-2.0-testing => jaxrs-2.0-common/testing}/src/main/java/Resource.java (100%) rename instrumentation/jaxws/{jaxws-2.0-testing => jaxws-2.0-common-testing}/build.gradle.kts (100%) rename instrumentation/jaxws/{jaxws-2.0-testing => jaxws-2.0-common-testing}/src/main/groovy/AbstractJaxWsTest.groovy (100%) rename instrumentation/jaxws/{jaxws-2.0-testing => jaxws-2.0-common-testing}/src/main/groovy/hello/BaseHelloService.groovy (100%) rename instrumentation/jaxws/{jaxws-2.0-testing => jaxws-2.0-common-testing}/src/main/groovy/hello/HelloService.groovy (100%) rename instrumentation/jaxws/{jaxws-2.0-testing => jaxws-2.0-common-testing}/src/main/groovy/hello/HelloServiceImpl.groovy (100%) rename instrumentation/jaxws/{jaxws-2.0-testing => jaxws-2.0-common-testing}/src/main/schema/hello.xsd (100%) rename instrumentation/jsf/{jsf-testing-common => jsf-common/testing}/build.gradle.kts (100%) rename instrumentation/jsf/{jsf-testing-common => jsf-common/testing}/src/main/groovy/BaseJsfTest.groovy (100%) rename instrumentation/jsf/{jsf-testing-common => jsf-common/testing}/src/main/groovy/ExceptionFilter.groovy (100%) rename instrumentation/jsf/{jsf-testing-common => jsf-common/testing}/src/main/groovy/GreetingForm.groovy (100%) rename instrumentation/jsf/{jsf-testing-common => jsf-common/testing}/src/main/resources/test-app-1.2/WEB-INF/faces-config.xml (100%) rename instrumentation/jsf/{jsf-testing-common => jsf-common/testing}/src/main/resources/test-app-1.2/WEB-INF/web.xml (100%) rename instrumentation/jsf/{jsf-testing-common => jsf-common/testing}/src/main/resources/test-app-1.2/greeting.xhtml (100%) rename instrumentation/jsf/{jsf-testing-common => jsf-common/testing}/src/main/resources/test-app-1.2/hello.xhtml (100%) rename instrumentation/jsf/{jsf-testing-common => jsf-common/testing}/src/main/resources/test-app-2/WEB-INF/faces-config.xml (100%) rename instrumentation/jsf/{jsf-testing-common => jsf-common/testing}/src/main/resources/test-app-2/WEB-INF/web.xml (100%) rename instrumentation/jsf/{jsf-testing-common => jsf-common/testing}/src/main/resources/test-app-2/greeting.xhtml (100%) rename instrumentation/jsf/{jsf-testing-common => jsf-common/testing}/src/main/resources/test-app-2/hello.xhtml (100%) rename instrumentation/jsf/{mojarra-1.2 => jsf-mojarra-1.2}/javaagent/build.gradle.kts (96%) rename instrumentation/jsf/{mojarra-1.2 => jsf-mojarra-1.2}/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/mojarra/ActionListenerImplInstrumentation.java (100%) rename instrumentation/jsf/{mojarra-1.2 => jsf-mojarra-1.2}/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/mojarra/MojarraInstrumentationModule.java (100%) rename instrumentation/jsf/{mojarra-1.2 => jsf-mojarra-1.2}/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/mojarra/MojarraSingletons.java (100%) rename instrumentation/jsf/{mojarra-1.2 => jsf-mojarra-1.2}/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/mojarra/RestoreViewPhaseInstrumentation.java (100%) rename instrumentation/jsf/{mojarra-1.2 => jsf-mojarra-1.2}/javaagent/src/mojarra12Test/groovy/Mojarra12Test.groovy (100%) rename instrumentation/jsf/{mojarra-1.2 => jsf-mojarra-1.2}/javaagent/src/mojarra12Test/resources/test-app-1.2-extra/META-INF/web-fragment.xml (100%) rename instrumentation/jsf/{mojarra-1.2 => jsf-mojarra-1.2}/javaagent/src/mojarra2LatestTest/groovy/Mojarra2LatestTest.groovy (100%) rename instrumentation/jsf/{mojarra-1.2 => jsf-mojarra-1.2}/javaagent/src/mojarra2Test/groovy/Mojarra2Test.groovy (100%) rename instrumentation/jsf/{myfaces-1.2 => jsf-myfaces-1.2}/javaagent/build.gradle.kts (94%) rename instrumentation/jsf/{myfaces-1.2 => jsf-myfaces-1.2}/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/myfaces/ActionListenerImplInstrumentation.java (100%) rename instrumentation/jsf/{myfaces-1.2 => jsf-myfaces-1.2}/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/myfaces/MyFacesErrorCauseExtractor.java (100%) rename instrumentation/jsf/{myfaces-1.2 => jsf-myfaces-1.2}/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/myfaces/MyFacesInstrumentationModule.java (100%) rename instrumentation/jsf/{myfaces-1.2 => jsf-myfaces-1.2}/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/myfaces/MyFacesSingletons.java (100%) rename instrumentation/jsf/{myfaces-1.2 => jsf-myfaces-1.2}/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/myfaces/RestoreViewExecutorInstrumentation.java (100%) rename instrumentation/jsf/{myfaces-1.2 => jsf-myfaces-1.2}/javaagent/src/myfaces12Test/groovy/Myfaces12Test.groovy (100%) rename instrumentation/jsf/{myfaces-1.2 => jsf-myfaces-1.2}/javaagent/src/myfaces12Test/resources/test-app-1.2-extra/META-INF/web-fragment.xml (100%) rename instrumentation/jsf/{myfaces-1.2 => jsf-myfaces-1.2}/javaagent/src/myfaces2LatestTest/groovy/Myfaces2LatestTest.groovy (100%) rename instrumentation/jsf/{myfaces-1.2 => jsf-myfaces-1.2}/javaagent/src/myfaces2LatestTest/resources/test-app-2-extra/META-INF/web-fragment.xml (100%) rename instrumentation/jsf/{myfaces-1.2 => jsf-myfaces-1.2}/javaagent/src/myfaces2Test/groovy/Myfaces2Test.groovy (100%) rename instrumentation/jsf/{myfaces-1.2 => jsf-myfaces-1.2}/javaagent/src/myfaces2Test/resources/test-app-2-extra/META-INF/web-fragment.xml (100%) rename instrumentation/log4j/{log4j-2-testing => log4j-2-common/testing}/build.gradle.kts (100%) rename instrumentation/log4j/{log4j-2-testing => log4j-2-common/testing}/src/main/groovy/Log4j2Test.groovy (100%) rename instrumentation/log4j/{log4j-2-testing => log4j-2-common/testing}/src/main/java/io/opentelemetry/instrumentation/log4j/v2_13_2/ListAppender.java (100%) rename instrumentation/log4j/{log4j-2-testing => log4j-2-common/testing}/src/main/resources/log4j2-test.xml (100%) rename instrumentation/mongo/{mongo-testing => mongo-common/testing}/build.gradle.kts (100%) rename instrumentation/mongo/{mongo-testing => mongo-common/testing}/src/main/groovy/io/opentelemetry/instrumentation/mongo/testing/AbstractMongoClientTest.groovy (100%) rename instrumentation/play-ws/{play-ws-testing => play-ws-common/testing}/build.gradle.kts (100%) rename instrumentation/play-ws/{play-ws-testing => play-ws-common/testing}/src/main/groovy/PlayWsClientTestBase.groovy (100%) rename instrumentation/play-ws/{play-ws-testing => play-ws-common/testing}/src/main/groovy/PlayWsClientTestBaseBase.groovy (100%) diff --git a/instrumentation/couchbase/couchbase-2.0/javaagent/build.gradle.kts b/instrumentation/couchbase/couchbase-2.0/javaagent/build.gradle.kts index 405c4b552695..63aad242e51c 100644 --- a/instrumentation/couchbase/couchbase-2.0/javaagent/build.gradle.kts +++ b/instrumentation/couchbase/couchbase-2.0/javaagent/build.gradle.kts @@ -35,7 +35,7 @@ dependencies { library("com.couchbase.client:java-client:2.0.0") - testImplementation(project(":instrumentation:couchbase:couchbase-testing")) + testImplementation(project(":instrumentation:couchbase:couchbase-common:testing")) latestDepTestLibrary("org.springframework.data:spring-data-couchbase:3.+") latestDepTestLibrary("com.couchbase.client:java-client:2.+") diff --git a/instrumentation/couchbase/couchbase-2.6/javaagent/build.gradle.kts b/instrumentation/couchbase/couchbase-2.6/javaagent/build.gradle.kts index 659763f59053..4a8fcd468c09 100644 --- a/instrumentation/couchbase/couchbase-2.6/javaagent/build.gradle.kts +++ b/instrumentation/couchbase/couchbase-2.6/javaagent/build.gradle.kts @@ -24,7 +24,7 @@ dependencies { library("com.couchbase.client:java-client:2.6.0") testInstrumentation(project(":instrumentation:couchbase:couchbase-2.0:javaagent")) - testImplementation(project(":instrumentation:couchbase:couchbase-testing")) + testImplementation(project(":instrumentation:couchbase:couchbase-common:testing")) testLibrary("org.springframework.data:spring-data-couchbase:3.1.0.RELEASE") testLibrary("com.couchbase.client:encryption:1.0.0") diff --git a/instrumentation/couchbase/couchbase-testing/build.gradle.kts b/instrumentation/couchbase/couchbase-common/testing/build.gradle.kts similarity index 100% rename from instrumentation/couchbase/couchbase-testing/build.gradle.kts rename to instrumentation/couchbase/couchbase-common/testing/build.gradle.kts diff --git a/instrumentation/couchbase/couchbase-testing/src/main/groovy/AbstractCouchbaseAsyncClientTest.groovy b/instrumentation/couchbase/couchbase-common/testing/src/main/groovy/AbstractCouchbaseAsyncClientTest.groovy similarity index 97% rename from instrumentation/couchbase/couchbase-testing/src/main/groovy/AbstractCouchbaseAsyncClientTest.groovy rename to instrumentation/couchbase/couchbase-common/testing/src/main/groovy/AbstractCouchbaseAsyncClientTest.groovy index 06f7193422f6..d5171ef338e2 100644 --- a/instrumentation/couchbase/couchbase-testing/src/main/groovy/AbstractCouchbaseAsyncClientTest.groovy +++ b/instrumentation/couchbase/couchbase-common/testing/src/main/groovy/AbstractCouchbaseAsyncClientTest.groovy @@ -47,7 +47,7 @@ abstract class AbstractCouchbaseAsyncClientTest extends AbstractCouchbaseTest { environment = envBuilder(bucketSettings).build() cluster = CouchbaseAsyncCluster.create(environment, Arrays.asList("127.0.0.1")) - manager = cluster.clusterManager(USERNAME, PASSWORD).toBlocking().single() + manager = cluster.clusterManager(AbstractCouchbaseTest.USERNAME, AbstractCouchbaseTest.PASSWORD).toBlocking().single() type = bucketSettings.type().name() } diff --git a/instrumentation/couchbase/couchbase-testing/src/main/groovy/AbstractCouchbaseClientTest.groovy b/instrumentation/couchbase/couchbase-common/testing/src/main/groovy/AbstractCouchbaseClientTest.groovy similarity index 97% rename from instrumentation/couchbase/couchbase-testing/src/main/groovy/AbstractCouchbaseClientTest.groovy rename to instrumentation/couchbase/couchbase-common/testing/src/main/groovy/AbstractCouchbaseClientTest.groovy index de7b48bed5b3..fa8ca138ba1a 100644 --- a/instrumentation/couchbase/couchbase-testing/src/main/groovy/AbstractCouchbaseClientTest.groovy +++ b/instrumentation/couchbase/couchbase-common/testing/src/main/groovy/AbstractCouchbaseClientTest.groovy @@ -37,7 +37,7 @@ abstract class AbstractCouchbaseClientTest extends AbstractCouchbaseTest { environment = envBuilder(bucketSettings).build() cluster = CouchbaseCluster.create(environment, Arrays.asList("127.0.0.1")) - manager = cluster.clusterManager(USERNAME, PASSWORD) + manager = cluster.clusterManager(AbstractCouchbaseTest.USERNAME, AbstractCouchbaseTest.PASSWORD) type = bucketSettings.type().name() } diff --git a/instrumentation/couchbase/couchbase-testing/src/main/groovy/springdata/AbstractCouchbaseSpringRepositoryTest.groovy b/instrumentation/couchbase/couchbase-common/testing/src/main/groovy/springdata/AbstractCouchbaseSpringRepositoryTest.groovy similarity index 100% rename from instrumentation/couchbase/couchbase-testing/src/main/groovy/springdata/AbstractCouchbaseSpringRepositoryTest.groovy rename to instrumentation/couchbase/couchbase-common/testing/src/main/groovy/springdata/AbstractCouchbaseSpringRepositoryTest.groovy diff --git a/instrumentation/couchbase/couchbase-testing/src/main/groovy/springdata/AbstractCouchbaseSpringTemplateTest.groovy b/instrumentation/couchbase/couchbase-common/testing/src/main/groovy/springdata/AbstractCouchbaseSpringTemplateTest.groovy similarity index 96% rename from instrumentation/couchbase/couchbase-testing/src/main/groovy/springdata/AbstractCouchbaseSpringTemplateTest.groovy rename to instrumentation/couchbase/couchbase-common/testing/src/main/groovy/springdata/AbstractCouchbaseSpringTemplateTest.groovy index f352a5701404..bbd5a864e871 100644 --- a/instrumentation/couchbase/couchbase-testing/src/main/groovy/springdata/AbstractCouchbaseSpringTemplateTest.groovy +++ b/instrumentation/couchbase/couchbase-common/testing/src/main/groovy/springdata/AbstractCouchbaseSpringTemplateTest.groovy @@ -42,8 +42,8 @@ class AbstractCouchbaseSpringTemplateTest extends AbstractCouchbaseTest { couchbaseCluster = CouchbaseCluster.create(couchbaseEnvironment, Arrays.asList("127.0.0.1")) memcacheCluster = CouchbaseCluster.create(memcacheEnvironment, Arrays.asList("127.0.0.1")) - ClusterManager couchbaseManager = couchbaseCluster.clusterManager(USERNAME, PASSWORD) - ClusterManager memcacheManager = memcacheCluster.clusterManager(USERNAME, PASSWORD) + ClusterManager couchbaseManager = couchbaseCluster.clusterManager(AbstractCouchbaseTest.USERNAME, AbstractCouchbaseTest.PASSWORD) + ClusterManager memcacheManager = memcacheCluster.clusterManager(AbstractCouchbaseTest.USERNAME, AbstractCouchbaseTest.PASSWORD) Bucket bucketCouchbase = couchbaseCluster.openBucket(bucketCouchbase.name(), bucketCouchbase.password()) Bucket bucketMemcache = memcacheCluster.openBucket(bucketMemcache.name(), bucketMemcache.password()) diff --git a/instrumentation/couchbase/couchbase-testing/src/main/groovy/springdata/CouchbaseConfig.groovy b/instrumentation/couchbase/couchbase-common/testing/src/main/groovy/springdata/CouchbaseConfig.groovy similarity index 100% rename from instrumentation/couchbase/couchbase-testing/src/main/groovy/springdata/CouchbaseConfig.groovy rename to instrumentation/couchbase/couchbase-common/testing/src/main/groovy/springdata/CouchbaseConfig.groovy diff --git a/instrumentation/couchbase/couchbase-testing/src/main/groovy/springdata/Doc.groovy b/instrumentation/couchbase/couchbase-common/testing/src/main/groovy/springdata/Doc.groovy similarity index 100% rename from instrumentation/couchbase/couchbase-testing/src/main/groovy/springdata/Doc.groovy rename to instrumentation/couchbase/couchbase-common/testing/src/main/groovy/springdata/Doc.groovy diff --git a/instrumentation/couchbase/couchbase-testing/src/main/groovy/springdata/DocRepository.groovy b/instrumentation/couchbase/couchbase-common/testing/src/main/groovy/springdata/DocRepository.groovy similarity index 100% rename from instrumentation/couchbase/couchbase-testing/src/main/groovy/springdata/DocRepository.groovy rename to instrumentation/couchbase/couchbase-common/testing/src/main/groovy/springdata/DocRepository.groovy diff --git a/instrumentation/couchbase/couchbase-testing/src/main/groovy/util/AbstractCouchbaseTest.groovy b/instrumentation/couchbase/couchbase-common/testing/src/main/groovy/util/AbstractCouchbaseTest.groovy similarity index 100% rename from instrumentation/couchbase/couchbase-testing/src/main/groovy/util/AbstractCouchbaseTest.groovy rename to instrumentation/couchbase/couchbase-common/testing/src/main/groovy/util/AbstractCouchbaseTest.groovy diff --git a/instrumentation/elasticsearch/elasticsearch-transport-5.0/javaagent/build.gradle.kts b/instrumentation/elasticsearch/elasticsearch-transport-5.0/javaagent/build.gradle.kts index 2690ac269263..790694dc3e72 100644 --- a/instrumentation/elasticsearch/elasticsearch-transport-5.0/javaagent/build.gradle.kts +++ b/instrumentation/elasticsearch/elasticsearch-transport-5.0/javaagent/build.gradle.kts @@ -33,7 +33,7 @@ dependencies { testInstrumentation(project(":instrumentation:apache-httpasyncclient-4.1:javaagent")) testInstrumentation(project(":instrumentation:netty:netty-4.1:javaagent")) - testImplementation(project(":instrumentation:elasticsearch:elasticsearch-transport-testing")) + testImplementation(project(":instrumentation:elasticsearch:elasticsearch-transport-common:testing")) testImplementation("org.apache.logging.log4j:log4j-core:2.11.0") testImplementation("org.apache.logging.log4j:log4j-api:2.11.0") diff --git a/instrumentation/elasticsearch/elasticsearch-transport-5.3/javaagent/build.gradle.kts b/instrumentation/elasticsearch/elasticsearch-transport-5.3/javaagent/build.gradle.kts index 8c417326e86c..c1ac095d77e9 100644 --- a/instrumentation/elasticsearch/elasticsearch-transport-5.3/javaagent/build.gradle.kts +++ b/instrumentation/elasticsearch/elasticsearch-transport-5.3/javaagent/build.gradle.kts @@ -38,7 +38,7 @@ dependencies { testInstrumentation(project(":instrumentation:netty:netty-4.1:javaagent")) testInstrumentation(project(":instrumentation:spring:spring-data-1.8:javaagent")) - testImplementation(project(":instrumentation:elasticsearch:elasticsearch-transport-testing")) + testImplementation(project(":instrumentation:elasticsearch:elasticsearch-transport-common:testing")) testImplementation("org.apache.logging.log4j:log4j-core:2.11.0") testImplementation("org.apache.logging.log4j:log4j-api:2.11.0") diff --git a/instrumentation/elasticsearch/elasticsearch-transport-6.0/javaagent/build.gradle.kts b/instrumentation/elasticsearch/elasticsearch-transport-6.0/javaagent/build.gradle.kts index 42c178104edf..3f534be503a2 100644 --- a/instrumentation/elasticsearch/elasticsearch-transport-6.0/javaagent/build.gradle.kts +++ b/instrumentation/elasticsearch/elasticsearch-transport-6.0/javaagent/build.gradle.kts @@ -35,7 +35,7 @@ dependencies { testLibrary("org.elasticsearch.plugin:transport-netty4-client:6.0.0") - testImplementation(project(":instrumentation:elasticsearch:elasticsearch-transport-testing")) + testImplementation(project(":instrumentation:elasticsearch:elasticsearch-transport-common:testing")) testImplementation("org.apache.logging.log4j:log4j-core:2.11.0") testImplementation("org.apache.logging.log4j:log4j-api:2.11.0") } diff --git a/instrumentation/elasticsearch/elasticsearch-transport-testing/build.gradle.kts b/instrumentation/elasticsearch/elasticsearch-transport-common/testing/build.gradle.kts similarity index 100% rename from instrumentation/elasticsearch/elasticsearch-transport-testing/build.gradle.kts rename to instrumentation/elasticsearch/elasticsearch-transport-common/testing/build.gradle.kts diff --git a/instrumentation/elasticsearch/elasticsearch-transport-testing/src/main/groovy/AbstractElasticsearchClientTest.groovy b/instrumentation/elasticsearch/elasticsearch-transport-common/testing/src/main/groovy/AbstractElasticsearchClientTest.groovy similarity index 100% rename from instrumentation/elasticsearch/elasticsearch-transport-testing/src/main/groovy/AbstractElasticsearchClientTest.groovy rename to instrumentation/elasticsearch/elasticsearch-transport-common/testing/src/main/groovy/AbstractElasticsearchClientTest.groovy diff --git a/instrumentation/elasticsearch/elasticsearch-transport-testing/src/main/groovy/AbstractElasticsearchNodeClientTest.groovy b/instrumentation/elasticsearch/elasticsearch-transport-common/testing/src/main/groovy/AbstractElasticsearchNodeClientTest.groovy similarity index 100% rename from instrumentation/elasticsearch/elasticsearch-transport-testing/src/main/groovy/AbstractElasticsearchNodeClientTest.groovy rename to instrumentation/elasticsearch/elasticsearch-transport-common/testing/src/main/groovy/AbstractElasticsearchNodeClientTest.groovy diff --git a/instrumentation/elasticsearch/elasticsearch-transport-testing/src/main/groovy/AbstractElasticsearchTransportClientTest.groovy b/instrumentation/elasticsearch/elasticsearch-transport-common/testing/src/main/groovy/AbstractElasticsearchTransportClientTest.groovy similarity index 100% rename from instrumentation/elasticsearch/elasticsearch-transport-testing/src/main/groovy/AbstractElasticsearchTransportClientTest.groovy rename to instrumentation/elasticsearch/elasticsearch-transport-common/testing/src/main/groovy/AbstractElasticsearchTransportClientTest.groovy diff --git a/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-testing/build.gradle.kts b/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-common/testing/build.gradle.kts similarity index 100% rename from instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-testing/build.gradle.kts rename to instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-common/testing/build.gradle.kts diff --git a/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-testing/src/main/groovy/JaxRsFilterTest.groovy b/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-common/testing/src/main/groovy/JaxRsFilterTest.groovy similarity index 100% rename from instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-testing/src/main/groovy/JaxRsFilterTest.groovy rename to instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-common/testing/src/main/groovy/JaxRsFilterTest.groovy diff --git a/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-testing/src/main/groovy/JaxRsHttpServerTest.groovy b/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-common/testing/src/main/groovy/JaxRsHttpServerTest.groovy similarity index 100% rename from instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-testing/src/main/groovy/JaxRsHttpServerTest.groovy rename to instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-common/testing/src/main/groovy/JaxRsHttpServerTest.groovy diff --git a/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-testing/src/main/groovy/JaxRsJettyHttpServerTest.groovy b/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-common/testing/src/main/groovy/JaxRsJettyHttpServerTest.groovy similarity index 91% rename from instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-testing/src/main/groovy/JaxRsJettyHttpServerTest.groovy rename to instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-common/testing/src/main/groovy/JaxRsJettyHttpServerTest.groovy index 400a5b3c5121..ce6e380afebe 100644 --- a/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-testing/src/main/groovy/JaxRsJettyHttpServerTest.groovy +++ b/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-common/testing/src/main/groovy/JaxRsJettyHttpServerTest.groovy @@ -8,7 +8,7 @@ import org.eclipse.jetty.webapp.WebAppContext import static org.eclipse.jetty.util.resource.Resource.newResource -class JaxRsJettyHttpServerTest extends JaxRsHttpServerTest { +abstract class JaxRsJettyHttpServerTest extends JaxRsHttpServerTest { @Override Server startServer(int port) { diff --git a/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-testing/src/main/groovy/JaxrsAnnotationsInstrumentationTest.groovy b/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-common/testing/src/main/groovy/JaxrsAnnotationsInstrumentationTest.groovy similarity index 100% rename from instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-testing/src/main/groovy/JaxrsAnnotationsInstrumentationTest.groovy rename to instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-common/testing/src/main/groovy/JaxrsAnnotationsInstrumentationTest.groovy diff --git a/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-testing/src/main/groovy/test/JaxRsTestResource.groovy b/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-common/testing/src/main/groovy/test/JaxRsTestResource.groovy similarity index 100% rename from instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-testing/src/main/groovy/test/JaxRsTestResource.groovy rename to instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-common/testing/src/main/groovy/test/JaxRsTestResource.groovy diff --git a/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-testing/src/main/java/JavaInterfaces.java b/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-common/testing/src/main/java/JavaInterfaces.java similarity index 100% rename from instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-testing/src/main/java/JavaInterfaces.java rename to instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-common/testing/src/main/java/JavaInterfaces.java diff --git a/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-testing/src/main/java/Resource.java b/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-common/testing/src/main/java/Resource.java similarity index 100% rename from instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-testing/src/main/java/Resource.java rename to instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-common/testing/src/main/java/Resource.java diff --git a/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-cxf-3.2/javaagent/build.gradle.kts b/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-cxf-3.2/javaagent/build.gradle.kts index 0f946e6f53aa..ed42a25d3c71 100644 --- a/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-cxf-3.2/javaagent/build.gradle.kts +++ b/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-cxf-3.2/javaagent/build.gradle.kts @@ -32,7 +32,7 @@ dependencies { testInstrumentation(project(":instrumentation:servlet:servlet-3.0:javaagent")) testInstrumentation(project(":instrumentation:jetty:jetty-8.0:javaagent")) - testImplementation(project(":instrumentation:jaxrs:jaxrs-2.0:jaxrs-2.0-testing")) + testImplementation(project(":instrumentation:jaxrs:jaxrs-2.0:jaxrs-2.0-common:testing")) testImplementation("javax.xml.bind:jaxb-api:2.2.3") testImplementation("org.eclipse.jetty:jetty-webapp:9.4.6.v20170531") diff --git a/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-jersey-2.0/javaagent/build.gradle.kts b/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-jersey-2.0/javaagent/build.gradle.kts index a801e13848f6..e90c0eb37ab7 100644 --- a/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-jersey-2.0/javaagent/build.gradle.kts +++ b/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-jersey-2.0/javaagent/build.gradle.kts @@ -32,7 +32,7 @@ dependencies { testInstrumentation(project(":instrumentation:servlet:servlet-3.0:javaagent")) testInstrumentation(project(":instrumentation:servlet:servlet-javax-common:javaagent")) - testImplementation(project(":instrumentation:jaxrs:jaxrs-2.0:jaxrs-2.0-testing")) + testImplementation(project(":instrumentation:jaxrs:jaxrs-2.0:jaxrs-2.0-common:testing")) // First version with DropwizardTestSupport: testLibrary("io.dropwizard:dropwizard-testing:0.8.0") diff --git a/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-resteasy-3.0/javaagent/build.gradle.kts b/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-resteasy-3.0/javaagent/build.gradle.kts index cd56789595c7..bac1a46d8e1a 100644 --- a/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-resteasy-3.0/javaagent/build.gradle.kts +++ b/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-resteasy-3.0/javaagent/build.gradle.kts @@ -34,7 +34,7 @@ dependencies { testInstrumentation(project(":instrumentation:servlet:servlet-3.0:javaagent")) testInstrumentation(project(":instrumentation:servlet:servlet-javax-common:javaagent")) - testImplementation(project(":instrumentation:jaxrs:jaxrs-2.0:jaxrs-2.0-testing")) + testImplementation(project(":instrumentation:jaxrs:jaxrs-2.0:jaxrs-2.0-common:testing")) testImplementation("org.eclipse.jetty:jetty-webapp:9.4.6.v20170531") testLibrary("org.jboss.resteasy:resteasy-undertow:3.0.4.Final") { diff --git a/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-resteasy-3.1/javaagent/build.gradle.kts b/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-resteasy-3.1/javaagent/build.gradle.kts index a0bc72f99dc3..db89740e84d7 100644 --- a/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-resteasy-3.1/javaagent/build.gradle.kts +++ b/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-resteasy-3.1/javaagent/build.gradle.kts @@ -32,7 +32,7 @@ dependencies { testInstrumentation(project(":instrumentation:servlet:servlet-3.0:javaagent")) testInstrumentation(project(":instrumentation:servlet:servlet-javax-common:javaagent")) - testImplementation(project(":instrumentation:jaxrs:jaxrs-2.0:jaxrs-2.0-testing")) + testImplementation(project(":instrumentation:jaxrs:jaxrs-2.0:jaxrs-2.0-common:testing")) testImplementation("org.eclipse.jetty:jetty-webapp:9.4.6.v20170531") testLibrary("org.jboss.resteasy:resteasy-undertow:3.1.0.Final") { diff --git a/instrumentation/jaxws/jaxws-2.0-axis2-1.6/javaagent/build.gradle.kts b/instrumentation/jaxws/jaxws-2.0-axis2-1.6/javaagent/build.gradle.kts index 2e0c6844226b..606c62ef2234 100644 --- a/instrumentation/jaxws/jaxws-2.0-axis2-1.6/javaagent/build.gradle.kts +++ b/instrumentation/jaxws/jaxws-2.0-axis2-1.6/javaagent/build.gradle.kts @@ -31,7 +31,7 @@ dependencies { testLibrary("org.apache.axis2:axis2-transport-http:$axis2Version") testLibrary("org.apache.axis2:axis2-transport-local:$axis2Version") - testImplementation(project(":instrumentation:jaxws:jaxws-2.0-testing")) + testImplementation(project(":instrumentation:jaxws:jaxws-2.0-common-testing")) testInstrumentation(project(":instrumentation:jaxws:jaxws-2.0:javaagent")) testInstrumentation(project(":instrumentation:jaxws:jaxws-jws-api-1.1:javaagent")) diff --git a/instrumentation/jaxws/jaxws-2.0-testing/build.gradle.kts b/instrumentation/jaxws/jaxws-2.0-common-testing/build.gradle.kts similarity index 100% rename from instrumentation/jaxws/jaxws-2.0-testing/build.gradle.kts rename to instrumentation/jaxws/jaxws-2.0-common-testing/build.gradle.kts diff --git a/instrumentation/jaxws/jaxws-2.0-testing/src/main/groovy/AbstractJaxWsTest.groovy b/instrumentation/jaxws/jaxws-2.0-common-testing/src/main/groovy/AbstractJaxWsTest.groovy similarity index 100% rename from instrumentation/jaxws/jaxws-2.0-testing/src/main/groovy/AbstractJaxWsTest.groovy rename to instrumentation/jaxws/jaxws-2.0-common-testing/src/main/groovy/AbstractJaxWsTest.groovy diff --git a/instrumentation/jaxws/jaxws-2.0-testing/src/main/groovy/hello/BaseHelloService.groovy b/instrumentation/jaxws/jaxws-2.0-common-testing/src/main/groovy/hello/BaseHelloService.groovy similarity index 100% rename from instrumentation/jaxws/jaxws-2.0-testing/src/main/groovy/hello/BaseHelloService.groovy rename to instrumentation/jaxws/jaxws-2.0-common-testing/src/main/groovy/hello/BaseHelloService.groovy diff --git a/instrumentation/jaxws/jaxws-2.0-testing/src/main/groovy/hello/HelloService.groovy b/instrumentation/jaxws/jaxws-2.0-common-testing/src/main/groovy/hello/HelloService.groovy similarity index 100% rename from instrumentation/jaxws/jaxws-2.0-testing/src/main/groovy/hello/HelloService.groovy rename to instrumentation/jaxws/jaxws-2.0-common-testing/src/main/groovy/hello/HelloService.groovy diff --git a/instrumentation/jaxws/jaxws-2.0-testing/src/main/groovy/hello/HelloServiceImpl.groovy b/instrumentation/jaxws/jaxws-2.0-common-testing/src/main/groovy/hello/HelloServiceImpl.groovy similarity index 100% rename from instrumentation/jaxws/jaxws-2.0-testing/src/main/groovy/hello/HelloServiceImpl.groovy rename to instrumentation/jaxws/jaxws-2.0-common-testing/src/main/groovy/hello/HelloServiceImpl.groovy diff --git a/instrumentation/jaxws/jaxws-2.0-testing/src/main/schema/hello.xsd b/instrumentation/jaxws/jaxws-2.0-common-testing/src/main/schema/hello.xsd similarity index 100% rename from instrumentation/jaxws/jaxws-2.0-testing/src/main/schema/hello.xsd rename to instrumentation/jaxws/jaxws-2.0-common-testing/src/main/schema/hello.xsd diff --git a/instrumentation/jaxws/jaxws-2.0-cxf-3.0/javaagent/build.gradle.kts b/instrumentation/jaxws/jaxws-2.0-cxf-3.0/javaagent/build.gradle.kts index 8e7230874dec..93e91a4b04c4 100644 --- a/instrumentation/jaxws/jaxws-2.0-cxf-3.0/javaagent/build.gradle.kts +++ b/instrumentation/jaxws/jaxws-2.0-cxf-3.0/javaagent/build.gradle.kts @@ -18,7 +18,7 @@ dependencies { library("org.apache.cxf:cxf-rt-frontend-jaxws:3.0.0") testLibrary("org.apache.cxf:cxf-rt-transports-http:3.0.0") - testImplementation(project(":instrumentation:jaxws:jaxws-2.0-testing")) + testImplementation(project(":instrumentation:jaxws:jaxws-2.0-common-testing")) testInstrumentation(project(":instrumentation:jaxws:jaxws-2.0:javaagent")) testInstrumentation(project(":instrumentation:jaxws:jaxws-jws-api-1.1:javaagent")) diff --git a/instrumentation/jaxws/jaxws-2.0-metro-2.2/javaagent/build.gradle.kts b/instrumentation/jaxws/jaxws-2.0-metro-2.2/javaagent/build.gradle.kts index 817dd75d3362..4b5b62271cc0 100644 --- a/instrumentation/jaxws/jaxws-2.0-metro-2.2/javaagent/build.gradle.kts +++ b/instrumentation/jaxws/jaxws-2.0-metro-2.2/javaagent/build.gradle.kts @@ -19,7 +19,7 @@ dependencies { compileOnly("javax.servlet:javax.servlet-api:3.0.1") - testImplementation(project(":instrumentation:jaxws:jaxws-2.0-testing")) + testImplementation(project(":instrumentation:jaxws:jaxws-2.0-common-testing")) testInstrumentation(project(":instrumentation:jaxws:jaxws-2.0:javaagent")) testInstrumentation(project(":instrumentation:jaxws:jaxws-jws-api-1.1:javaagent")) diff --git a/instrumentation/jsf/jsf-testing-common/build.gradle.kts b/instrumentation/jsf/jsf-common/testing/build.gradle.kts similarity index 100% rename from instrumentation/jsf/jsf-testing-common/build.gradle.kts rename to instrumentation/jsf/jsf-common/testing/build.gradle.kts diff --git a/instrumentation/jsf/jsf-testing-common/src/main/groovy/BaseJsfTest.groovy b/instrumentation/jsf/jsf-common/testing/src/main/groovy/BaseJsfTest.groovy similarity index 100% rename from instrumentation/jsf/jsf-testing-common/src/main/groovy/BaseJsfTest.groovy rename to instrumentation/jsf/jsf-common/testing/src/main/groovy/BaseJsfTest.groovy diff --git a/instrumentation/jsf/jsf-testing-common/src/main/groovy/ExceptionFilter.groovy b/instrumentation/jsf/jsf-common/testing/src/main/groovy/ExceptionFilter.groovy similarity index 100% rename from instrumentation/jsf/jsf-testing-common/src/main/groovy/ExceptionFilter.groovy rename to instrumentation/jsf/jsf-common/testing/src/main/groovy/ExceptionFilter.groovy diff --git a/instrumentation/jsf/jsf-testing-common/src/main/groovy/GreetingForm.groovy b/instrumentation/jsf/jsf-common/testing/src/main/groovy/GreetingForm.groovy similarity index 100% rename from instrumentation/jsf/jsf-testing-common/src/main/groovy/GreetingForm.groovy rename to instrumentation/jsf/jsf-common/testing/src/main/groovy/GreetingForm.groovy diff --git a/instrumentation/jsf/jsf-testing-common/src/main/resources/test-app-1.2/WEB-INF/faces-config.xml b/instrumentation/jsf/jsf-common/testing/src/main/resources/test-app-1.2/WEB-INF/faces-config.xml similarity index 100% rename from instrumentation/jsf/jsf-testing-common/src/main/resources/test-app-1.2/WEB-INF/faces-config.xml rename to instrumentation/jsf/jsf-common/testing/src/main/resources/test-app-1.2/WEB-INF/faces-config.xml diff --git a/instrumentation/jsf/jsf-testing-common/src/main/resources/test-app-1.2/WEB-INF/web.xml b/instrumentation/jsf/jsf-common/testing/src/main/resources/test-app-1.2/WEB-INF/web.xml similarity index 100% rename from instrumentation/jsf/jsf-testing-common/src/main/resources/test-app-1.2/WEB-INF/web.xml rename to instrumentation/jsf/jsf-common/testing/src/main/resources/test-app-1.2/WEB-INF/web.xml diff --git a/instrumentation/jsf/jsf-testing-common/src/main/resources/test-app-1.2/greeting.xhtml b/instrumentation/jsf/jsf-common/testing/src/main/resources/test-app-1.2/greeting.xhtml similarity index 100% rename from instrumentation/jsf/jsf-testing-common/src/main/resources/test-app-1.2/greeting.xhtml rename to instrumentation/jsf/jsf-common/testing/src/main/resources/test-app-1.2/greeting.xhtml diff --git a/instrumentation/jsf/jsf-testing-common/src/main/resources/test-app-1.2/hello.xhtml b/instrumentation/jsf/jsf-common/testing/src/main/resources/test-app-1.2/hello.xhtml similarity index 100% rename from instrumentation/jsf/jsf-testing-common/src/main/resources/test-app-1.2/hello.xhtml rename to instrumentation/jsf/jsf-common/testing/src/main/resources/test-app-1.2/hello.xhtml diff --git a/instrumentation/jsf/jsf-testing-common/src/main/resources/test-app-2/WEB-INF/faces-config.xml b/instrumentation/jsf/jsf-common/testing/src/main/resources/test-app-2/WEB-INF/faces-config.xml similarity index 100% rename from instrumentation/jsf/jsf-testing-common/src/main/resources/test-app-2/WEB-INF/faces-config.xml rename to instrumentation/jsf/jsf-common/testing/src/main/resources/test-app-2/WEB-INF/faces-config.xml diff --git a/instrumentation/jsf/jsf-testing-common/src/main/resources/test-app-2/WEB-INF/web.xml b/instrumentation/jsf/jsf-common/testing/src/main/resources/test-app-2/WEB-INF/web.xml similarity index 100% rename from instrumentation/jsf/jsf-testing-common/src/main/resources/test-app-2/WEB-INF/web.xml rename to instrumentation/jsf/jsf-common/testing/src/main/resources/test-app-2/WEB-INF/web.xml diff --git a/instrumentation/jsf/jsf-testing-common/src/main/resources/test-app-2/greeting.xhtml b/instrumentation/jsf/jsf-common/testing/src/main/resources/test-app-2/greeting.xhtml similarity index 100% rename from instrumentation/jsf/jsf-testing-common/src/main/resources/test-app-2/greeting.xhtml rename to instrumentation/jsf/jsf-common/testing/src/main/resources/test-app-2/greeting.xhtml diff --git a/instrumentation/jsf/jsf-testing-common/src/main/resources/test-app-2/hello.xhtml b/instrumentation/jsf/jsf-common/testing/src/main/resources/test-app-2/hello.xhtml similarity index 100% rename from instrumentation/jsf/jsf-testing-common/src/main/resources/test-app-2/hello.xhtml rename to instrumentation/jsf/jsf-common/testing/src/main/resources/test-app-2/hello.xhtml diff --git a/instrumentation/jsf/mojarra-1.2/javaagent/build.gradle.kts b/instrumentation/jsf/jsf-mojarra-1.2/javaagent/build.gradle.kts similarity index 96% rename from instrumentation/jsf/mojarra-1.2/javaagent/build.gradle.kts rename to instrumentation/jsf/jsf-mojarra-1.2/javaagent/build.gradle.kts index 32676088353b..5326fffba2cc 100644 --- a/instrumentation/jsf/mojarra-1.2/javaagent/build.gradle.kts +++ b/instrumentation/jsf/jsf-mojarra-1.2/javaagent/build.gradle.kts @@ -66,7 +66,7 @@ dependencies { implementation(project(":instrumentation:jsf:jsf-common:library")) - testImplementation(project(":instrumentation:jsf:jsf-testing-common")) + testImplementation(project(":instrumentation:jsf:jsf-common:testing")) testInstrumentation(project(":instrumentation:servlet:servlet-3.0:javaagent")) testInstrumentation(project(":instrumentation:servlet:servlet-javax-common:javaagent")) diff --git a/instrumentation/jsf/mojarra-1.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/mojarra/ActionListenerImplInstrumentation.java b/instrumentation/jsf/jsf-mojarra-1.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/mojarra/ActionListenerImplInstrumentation.java similarity index 100% rename from instrumentation/jsf/mojarra-1.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/mojarra/ActionListenerImplInstrumentation.java rename to instrumentation/jsf/jsf-mojarra-1.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/mojarra/ActionListenerImplInstrumentation.java diff --git a/instrumentation/jsf/mojarra-1.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/mojarra/MojarraInstrumentationModule.java b/instrumentation/jsf/jsf-mojarra-1.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/mojarra/MojarraInstrumentationModule.java similarity index 100% rename from instrumentation/jsf/mojarra-1.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/mojarra/MojarraInstrumentationModule.java rename to instrumentation/jsf/jsf-mojarra-1.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/mojarra/MojarraInstrumentationModule.java diff --git a/instrumentation/jsf/mojarra-1.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/mojarra/MojarraSingletons.java b/instrumentation/jsf/jsf-mojarra-1.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/mojarra/MojarraSingletons.java similarity index 100% rename from instrumentation/jsf/mojarra-1.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/mojarra/MojarraSingletons.java rename to instrumentation/jsf/jsf-mojarra-1.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/mojarra/MojarraSingletons.java diff --git a/instrumentation/jsf/mojarra-1.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/mojarra/RestoreViewPhaseInstrumentation.java b/instrumentation/jsf/jsf-mojarra-1.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/mojarra/RestoreViewPhaseInstrumentation.java similarity index 100% rename from instrumentation/jsf/mojarra-1.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/mojarra/RestoreViewPhaseInstrumentation.java rename to instrumentation/jsf/jsf-mojarra-1.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/mojarra/RestoreViewPhaseInstrumentation.java diff --git a/instrumentation/jsf/mojarra-1.2/javaagent/src/mojarra12Test/groovy/Mojarra12Test.groovy b/instrumentation/jsf/jsf-mojarra-1.2/javaagent/src/mojarra12Test/groovy/Mojarra12Test.groovy similarity index 100% rename from instrumentation/jsf/mojarra-1.2/javaagent/src/mojarra12Test/groovy/Mojarra12Test.groovy rename to instrumentation/jsf/jsf-mojarra-1.2/javaagent/src/mojarra12Test/groovy/Mojarra12Test.groovy diff --git a/instrumentation/jsf/mojarra-1.2/javaagent/src/mojarra12Test/resources/test-app-1.2-extra/META-INF/web-fragment.xml b/instrumentation/jsf/jsf-mojarra-1.2/javaagent/src/mojarra12Test/resources/test-app-1.2-extra/META-INF/web-fragment.xml similarity index 100% rename from instrumentation/jsf/mojarra-1.2/javaagent/src/mojarra12Test/resources/test-app-1.2-extra/META-INF/web-fragment.xml rename to instrumentation/jsf/jsf-mojarra-1.2/javaagent/src/mojarra12Test/resources/test-app-1.2-extra/META-INF/web-fragment.xml diff --git a/instrumentation/jsf/mojarra-1.2/javaagent/src/mojarra2LatestTest/groovy/Mojarra2LatestTest.groovy b/instrumentation/jsf/jsf-mojarra-1.2/javaagent/src/mojarra2LatestTest/groovy/Mojarra2LatestTest.groovy similarity index 100% rename from instrumentation/jsf/mojarra-1.2/javaagent/src/mojarra2LatestTest/groovy/Mojarra2LatestTest.groovy rename to instrumentation/jsf/jsf-mojarra-1.2/javaagent/src/mojarra2LatestTest/groovy/Mojarra2LatestTest.groovy diff --git a/instrumentation/jsf/mojarra-1.2/javaagent/src/mojarra2Test/groovy/Mojarra2Test.groovy b/instrumentation/jsf/jsf-mojarra-1.2/javaagent/src/mojarra2Test/groovy/Mojarra2Test.groovy similarity index 100% rename from instrumentation/jsf/mojarra-1.2/javaagent/src/mojarra2Test/groovy/Mojarra2Test.groovy rename to instrumentation/jsf/jsf-mojarra-1.2/javaagent/src/mojarra2Test/groovy/Mojarra2Test.groovy diff --git a/instrumentation/jsf/myfaces-1.2/javaagent/build.gradle.kts b/instrumentation/jsf/jsf-myfaces-1.2/javaagent/build.gradle.kts similarity index 94% rename from instrumentation/jsf/myfaces-1.2/javaagent/build.gradle.kts rename to instrumentation/jsf/jsf-myfaces-1.2/javaagent/build.gradle.kts index c6b33fab12c4..cb037af6e122 100644 --- a/instrumentation/jsf/myfaces-1.2/javaagent/build.gradle.kts +++ b/instrumentation/jsf/jsf-myfaces-1.2/javaagent/build.gradle.kts @@ -35,7 +35,7 @@ dependencies { implementation(project(":instrumentation:jsf:jsf-common:library")) - testImplementation(project(":instrumentation:jsf:jsf-testing-common")) + testImplementation(project(":instrumentation:jsf:jsf-common:testing")) testInstrumentation(project(":instrumentation:servlet:servlet-3.0:javaagent")) testInstrumentation(project(":instrumentation:servlet:servlet-javax-common:javaagent")) diff --git a/instrumentation/jsf/myfaces-1.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/myfaces/ActionListenerImplInstrumentation.java b/instrumentation/jsf/jsf-myfaces-1.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/myfaces/ActionListenerImplInstrumentation.java similarity index 100% rename from instrumentation/jsf/myfaces-1.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/myfaces/ActionListenerImplInstrumentation.java rename to instrumentation/jsf/jsf-myfaces-1.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/myfaces/ActionListenerImplInstrumentation.java diff --git a/instrumentation/jsf/myfaces-1.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/myfaces/MyFacesErrorCauseExtractor.java b/instrumentation/jsf/jsf-myfaces-1.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/myfaces/MyFacesErrorCauseExtractor.java similarity index 100% rename from instrumentation/jsf/myfaces-1.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/myfaces/MyFacesErrorCauseExtractor.java rename to instrumentation/jsf/jsf-myfaces-1.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/myfaces/MyFacesErrorCauseExtractor.java diff --git a/instrumentation/jsf/myfaces-1.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/myfaces/MyFacesInstrumentationModule.java b/instrumentation/jsf/jsf-myfaces-1.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/myfaces/MyFacesInstrumentationModule.java similarity index 100% rename from instrumentation/jsf/myfaces-1.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/myfaces/MyFacesInstrumentationModule.java rename to instrumentation/jsf/jsf-myfaces-1.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/myfaces/MyFacesInstrumentationModule.java diff --git a/instrumentation/jsf/myfaces-1.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/myfaces/MyFacesSingletons.java b/instrumentation/jsf/jsf-myfaces-1.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/myfaces/MyFacesSingletons.java similarity index 100% rename from instrumentation/jsf/myfaces-1.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/myfaces/MyFacesSingletons.java rename to instrumentation/jsf/jsf-myfaces-1.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/myfaces/MyFacesSingletons.java diff --git a/instrumentation/jsf/myfaces-1.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/myfaces/RestoreViewExecutorInstrumentation.java b/instrumentation/jsf/jsf-myfaces-1.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/myfaces/RestoreViewExecutorInstrumentation.java similarity index 100% rename from instrumentation/jsf/myfaces-1.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/myfaces/RestoreViewExecutorInstrumentation.java rename to instrumentation/jsf/jsf-myfaces-1.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/myfaces/RestoreViewExecutorInstrumentation.java diff --git a/instrumentation/jsf/myfaces-1.2/javaagent/src/myfaces12Test/groovy/Myfaces12Test.groovy b/instrumentation/jsf/jsf-myfaces-1.2/javaagent/src/myfaces12Test/groovy/Myfaces12Test.groovy similarity index 100% rename from instrumentation/jsf/myfaces-1.2/javaagent/src/myfaces12Test/groovy/Myfaces12Test.groovy rename to instrumentation/jsf/jsf-myfaces-1.2/javaagent/src/myfaces12Test/groovy/Myfaces12Test.groovy diff --git a/instrumentation/jsf/myfaces-1.2/javaagent/src/myfaces12Test/resources/test-app-1.2-extra/META-INF/web-fragment.xml b/instrumentation/jsf/jsf-myfaces-1.2/javaagent/src/myfaces12Test/resources/test-app-1.2-extra/META-INF/web-fragment.xml similarity index 100% rename from instrumentation/jsf/myfaces-1.2/javaagent/src/myfaces12Test/resources/test-app-1.2-extra/META-INF/web-fragment.xml rename to instrumentation/jsf/jsf-myfaces-1.2/javaagent/src/myfaces12Test/resources/test-app-1.2-extra/META-INF/web-fragment.xml diff --git a/instrumentation/jsf/myfaces-1.2/javaagent/src/myfaces2LatestTest/groovy/Myfaces2LatestTest.groovy b/instrumentation/jsf/jsf-myfaces-1.2/javaagent/src/myfaces2LatestTest/groovy/Myfaces2LatestTest.groovy similarity index 100% rename from instrumentation/jsf/myfaces-1.2/javaagent/src/myfaces2LatestTest/groovy/Myfaces2LatestTest.groovy rename to instrumentation/jsf/jsf-myfaces-1.2/javaagent/src/myfaces2LatestTest/groovy/Myfaces2LatestTest.groovy diff --git a/instrumentation/jsf/myfaces-1.2/javaagent/src/myfaces2LatestTest/resources/test-app-2-extra/META-INF/web-fragment.xml b/instrumentation/jsf/jsf-myfaces-1.2/javaagent/src/myfaces2LatestTest/resources/test-app-2-extra/META-INF/web-fragment.xml similarity index 100% rename from instrumentation/jsf/myfaces-1.2/javaagent/src/myfaces2LatestTest/resources/test-app-2-extra/META-INF/web-fragment.xml rename to instrumentation/jsf/jsf-myfaces-1.2/javaagent/src/myfaces2LatestTest/resources/test-app-2-extra/META-INF/web-fragment.xml diff --git a/instrumentation/jsf/myfaces-1.2/javaagent/src/myfaces2Test/groovy/Myfaces2Test.groovy b/instrumentation/jsf/jsf-myfaces-1.2/javaagent/src/myfaces2Test/groovy/Myfaces2Test.groovy similarity index 100% rename from instrumentation/jsf/myfaces-1.2/javaagent/src/myfaces2Test/groovy/Myfaces2Test.groovy rename to instrumentation/jsf/jsf-myfaces-1.2/javaagent/src/myfaces2Test/groovy/Myfaces2Test.groovy diff --git a/instrumentation/jsf/myfaces-1.2/javaagent/src/myfaces2Test/resources/test-app-2-extra/META-INF/web-fragment.xml b/instrumentation/jsf/jsf-myfaces-1.2/javaagent/src/myfaces2Test/resources/test-app-2-extra/META-INF/web-fragment.xml similarity index 100% rename from instrumentation/jsf/myfaces-1.2/javaagent/src/myfaces2Test/resources/test-app-2-extra/META-INF/web-fragment.xml rename to instrumentation/jsf/jsf-myfaces-1.2/javaagent/src/myfaces2Test/resources/test-app-2-extra/META-INF/web-fragment.xml diff --git a/instrumentation/log4j/log4j-2-testing/build.gradle.kts b/instrumentation/log4j/log4j-2-common/testing/build.gradle.kts similarity index 100% rename from instrumentation/log4j/log4j-2-testing/build.gradle.kts rename to instrumentation/log4j/log4j-2-common/testing/build.gradle.kts diff --git a/instrumentation/log4j/log4j-2-testing/src/main/groovy/Log4j2Test.groovy b/instrumentation/log4j/log4j-2-common/testing/src/main/groovy/Log4j2Test.groovy similarity index 100% rename from instrumentation/log4j/log4j-2-testing/src/main/groovy/Log4j2Test.groovy rename to instrumentation/log4j/log4j-2-common/testing/src/main/groovy/Log4j2Test.groovy diff --git a/instrumentation/log4j/log4j-2-testing/src/main/java/io/opentelemetry/instrumentation/log4j/v2_13_2/ListAppender.java b/instrumentation/log4j/log4j-2-common/testing/src/main/java/io/opentelemetry/instrumentation/log4j/v2_13_2/ListAppender.java similarity index 100% rename from instrumentation/log4j/log4j-2-testing/src/main/java/io/opentelemetry/instrumentation/log4j/v2_13_2/ListAppender.java rename to instrumentation/log4j/log4j-2-common/testing/src/main/java/io/opentelemetry/instrumentation/log4j/v2_13_2/ListAppender.java diff --git a/instrumentation/log4j/log4j-2-testing/src/main/resources/log4j2-test.xml b/instrumentation/log4j/log4j-2-common/testing/src/main/resources/log4j2-test.xml similarity index 100% rename from instrumentation/log4j/log4j-2-testing/src/main/resources/log4j2-test.xml rename to instrumentation/log4j/log4j-2-common/testing/src/main/resources/log4j2-test.xml diff --git a/instrumentation/log4j/log4j-2.13.2/javaagent/build.gradle.kts b/instrumentation/log4j/log4j-2.13.2/javaagent/build.gradle.kts index 79eec06b3351..76f46a206c48 100644 --- a/instrumentation/log4j/log4j-2.13.2/javaagent/build.gradle.kts +++ b/instrumentation/log4j/log4j-2.13.2/javaagent/build.gradle.kts @@ -25,7 +25,7 @@ dependencies { implementation(project(":instrumentation:log4j:log4j-2.13.2:library")) - testImplementation(project(":instrumentation:log4j:log4j-2-testing")) + testImplementation(project(":instrumentation:log4j:log4j-2-common:testing")) } tasks { diff --git a/instrumentation/log4j/log4j-2.13.2/library/build.gradle.kts b/instrumentation/log4j/log4j-2.13.2/library/build.gradle.kts index 920bb464b022..207b68b9a79b 100644 --- a/instrumentation/log4j/log4j-2.13.2/library/build.gradle.kts +++ b/instrumentation/log4j/log4j-2.13.2/library/build.gradle.kts @@ -9,5 +9,5 @@ dependencies { // around it. testLibrary("org.apache.logging.log4j:log4j-core:2.13.3") - testImplementation(project(":instrumentation:log4j:log4j-2-testing")) + testImplementation(project(":instrumentation:log4j:log4j-2-common:testing")) } diff --git a/instrumentation/log4j/log4j-2.7/javaagent/build.gradle.kts b/instrumentation/log4j/log4j-2.7/javaagent/build.gradle.kts index 361aee9d6fa0..b6e839968ea8 100644 --- a/instrumentation/log4j/log4j-2.7/javaagent/build.gradle.kts +++ b/instrumentation/log4j/log4j-2.7/javaagent/build.gradle.kts @@ -14,7 +14,7 @@ muzzle { dependencies { library("org.apache.logging.log4j:log4j-core:2.7") - testImplementation(project(":instrumentation:log4j:log4j-2-testing")) + testImplementation(project(":instrumentation:log4j:log4j-2-common:testing")) latestDepTestLibrary("org.apache.logging.log4j:log4j-core:2.13.1") } diff --git a/instrumentation/mongo/mongo-3.1/testing/build.gradle.kts b/instrumentation/mongo/mongo-3.1/testing/build.gradle.kts index d1ce4e89b763..201751bd05b7 100644 --- a/instrumentation/mongo/mongo-3.1/testing/build.gradle.kts +++ b/instrumentation/mongo/mongo-3.1/testing/build.gradle.kts @@ -3,7 +3,7 @@ plugins { } dependencies { - api(project(":instrumentation:mongo:mongo-testing")) + api(project(":instrumentation:mongo:mongo-common:testing")) compileOnly("org.mongodb:mongo-java-driver:3.1.0") diff --git a/instrumentation/mongo/mongo-3.7/javaagent/build.gradle.kts b/instrumentation/mongo/mongo-3.7/javaagent/build.gradle.kts index 8cc0b240aeda..7452329932bc 100644 --- a/instrumentation/mongo/mongo-3.7/javaagent/build.gradle.kts +++ b/instrumentation/mongo/mongo-3.7/javaagent/build.gradle.kts @@ -26,7 +26,7 @@ dependencies { // a couple of test attribute verifications don't pass until 3.8.0 library("org.mongodb:mongo-java-driver:3.8.0") - testImplementation(project(":instrumentation:mongo:mongo-testing")) + testImplementation(project(":instrumentation:mongo:mongo-common:testing")) } tasks { diff --git a/instrumentation/mongo/mongo-4.0/javaagent/build.gradle.kts b/instrumentation/mongo/mongo-4.0/javaagent/build.gradle.kts index 6c3030c42a6b..157ffe25f148 100644 --- a/instrumentation/mongo/mongo-4.0/javaagent/build.gradle.kts +++ b/instrumentation/mongo/mongo-4.0/javaagent/build.gradle.kts @@ -19,7 +19,7 @@ dependencies { testLibrary("org.mongodb:mongodb-driver-sync:4.0.0") testLibrary("org.mongodb:mongodb-driver-reactivestreams:4.0.0") - testImplementation(project(":instrumentation:mongo:mongo-testing")) + testImplementation(project(":instrumentation:mongo:mongo-common:testing")) testImplementation("de.flapdoodle.embed:de.flapdoodle.embed.mongo:1.50.5") } diff --git a/instrumentation/mongo/mongo-async-3.3/javaagent/build.gradle.kts b/instrumentation/mongo/mongo-async-3.3/javaagent/build.gradle.kts index 7fcdda50e16f..969b5bb8df71 100644 --- a/instrumentation/mongo/mongo-async-3.3/javaagent/build.gradle.kts +++ b/instrumentation/mongo/mongo-async-3.3/javaagent/build.gradle.kts @@ -17,7 +17,7 @@ dependencies { library("org.mongodb:mongodb-driver-async:3.3.0") - testImplementation(project(":instrumentation:mongo:mongo-testing")) + testImplementation(project(":instrumentation:mongo:mongo-common:testing")) testInstrumentation(project(":instrumentation:mongo:mongo-3.7:javaagent")) } diff --git a/instrumentation/mongo/mongo-testing/build.gradle.kts b/instrumentation/mongo/mongo-common/testing/build.gradle.kts similarity index 100% rename from instrumentation/mongo/mongo-testing/build.gradle.kts rename to instrumentation/mongo/mongo-common/testing/build.gradle.kts diff --git a/instrumentation/mongo/mongo-testing/src/main/groovy/io/opentelemetry/instrumentation/mongo/testing/AbstractMongoClientTest.groovy b/instrumentation/mongo/mongo-common/testing/src/main/groovy/io/opentelemetry/instrumentation/mongo/testing/AbstractMongoClientTest.groovy similarity index 100% rename from instrumentation/mongo/mongo-testing/src/main/groovy/io/opentelemetry/instrumentation/mongo/testing/AbstractMongoClientTest.groovy rename to instrumentation/mongo/mongo-common/testing/src/main/groovy/io/opentelemetry/instrumentation/mongo/testing/AbstractMongoClientTest.groovy diff --git a/instrumentation/play-ws/play-ws-1.0/javaagent/build.gradle.kts b/instrumentation/play-ws/play-ws-1.0/javaagent/build.gradle.kts index 35c1d46242fc..754fa1d7763e 100644 --- a/instrumentation/play-ws/play-ws-1.0/javaagent/build.gradle.kts +++ b/instrumentation/play-ws/play-ws-1.0/javaagent/build.gradle.kts @@ -29,7 +29,7 @@ dependencies { implementation(project(":instrumentation:play-ws:play-ws-common:javaagent")) - testImplementation(project(":instrumentation:play-ws:play-ws-testing")) + testImplementation(project(":instrumentation:play-ws:play-ws-common:testing")) // These are to ensure cross compatibility testInstrumentation(project(":instrumentation:netty:netty-4.0:javaagent")) diff --git a/instrumentation/play-ws/play-ws-2.0/javaagent/build.gradle.kts b/instrumentation/play-ws/play-ws-2.0/javaagent/build.gradle.kts index 55e7b671a127..63f991fe9a98 100644 --- a/instrumentation/play-ws/play-ws-2.0/javaagent/build.gradle.kts +++ b/instrumentation/play-ws/play-ws-2.0/javaagent/build.gradle.kts @@ -35,7 +35,7 @@ dependencies { implementation(project(":instrumentation:play-ws:play-ws-common:javaagent")) - testImplementation(project(":instrumentation:play-ws:play-ws-testing")) + testImplementation(project(":instrumentation:play-ws:play-ws-common:testing")) // These are to ensure cross compatibility testInstrumentation(project(":instrumentation:netty:netty-4.0:javaagent")) diff --git a/instrumentation/play-ws/play-ws-2.1/javaagent/build.gradle.kts b/instrumentation/play-ws/play-ws-2.1/javaagent/build.gradle.kts index a25969508c82..32fc7508aee4 100644 --- a/instrumentation/play-ws/play-ws-2.1/javaagent/build.gradle.kts +++ b/instrumentation/play-ws/play-ws-2.1/javaagent/build.gradle.kts @@ -34,7 +34,7 @@ dependencies { implementation(project(":instrumentation:play-ws:play-ws-common:javaagent")) - testImplementation(project(":instrumentation:play-ws:play-ws-testing")) + testImplementation(project(":instrumentation:play-ws:play-ws-common:testing")) // These are to ensure cross compatibility testInstrumentation(project(":instrumentation:netty:netty-4.0:javaagent")) diff --git a/instrumentation/play-ws/play-ws-testing/build.gradle.kts b/instrumentation/play-ws/play-ws-common/testing/build.gradle.kts similarity index 100% rename from instrumentation/play-ws/play-ws-testing/build.gradle.kts rename to instrumentation/play-ws/play-ws-common/testing/build.gradle.kts diff --git a/instrumentation/play-ws/play-ws-testing/src/main/groovy/PlayWsClientTestBase.groovy b/instrumentation/play-ws/play-ws-common/testing/src/main/groovy/PlayWsClientTestBase.groovy similarity index 100% rename from instrumentation/play-ws/play-ws-testing/src/main/groovy/PlayWsClientTestBase.groovy rename to instrumentation/play-ws/play-ws-common/testing/src/main/groovy/PlayWsClientTestBase.groovy diff --git a/instrumentation/play-ws/play-ws-testing/src/main/groovy/PlayWsClientTestBaseBase.groovy b/instrumentation/play-ws/play-ws-common/testing/src/main/groovy/PlayWsClientTestBaseBase.groovy similarity index 100% rename from instrumentation/play-ws/play-ws-testing/src/main/groovy/PlayWsClientTestBaseBase.groovy rename to instrumentation/play-ws/play-ws-common/testing/src/main/groovy/PlayWsClientTestBaseBase.groovy diff --git a/settings.gradle.kts b/settings.gradle.kts index 7552dec45f34..6c7a533a2563 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -136,7 +136,7 @@ include(":instrumentation:couchbase:couchbase-3.1.6:javaagent") include(":instrumentation:couchbase:couchbase-3.1.6:tracing-opentelemetry-shaded") include(":instrumentation:couchbase:couchbase-3.2:javaagent") include(":instrumentation:couchbase:couchbase-3.2:tracing-opentelemetry-shaded") -include(":instrumentation:couchbase:couchbase-testing") +include(":instrumentation:couchbase:couchbase-common:testing") include(":instrumentation:dropwizard-views-0.7:javaagent") include(":instrumentation:dropwizard-testing") include(":instrumentation:elasticsearch:elasticsearch-rest-common:javaagent") @@ -144,7 +144,7 @@ include(":instrumentation:elasticsearch:elasticsearch-rest-5.0:javaagent") include(":instrumentation:elasticsearch:elasticsearch-rest-6.4:javaagent") include(":instrumentation:elasticsearch:elasticsearch-rest-7.0:javaagent") include(":instrumentation:elasticsearch:elasticsearch-transport-common:library") -include(":instrumentation:elasticsearch:elasticsearch-transport-testing") +include(":instrumentation:elasticsearch:elasticsearch-transport-common:testing") include(":instrumentation:elasticsearch:elasticsearch-transport-5.0:javaagent") include(":instrumentation:elasticsearch:elasticsearch-transport-5.3:javaagent") include(":instrumentation:elasticsearch:elasticsearch-transport-6.0:javaagent") @@ -179,7 +179,7 @@ include(":instrumentation:jaxrs:jaxrs-2.0:jaxrs-2.0-payara-testing") include(":instrumentation:jaxrs:jaxrs-2.0:jaxrs-2.0-resteasy-3.0:javaagent") include(":instrumentation:jaxrs:jaxrs-2.0:jaxrs-2.0-resteasy-3.1:javaagent") include(":instrumentation:jaxrs:jaxrs-2.0:jaxrs-2.0-resteasy-common:javaagent") -include(":instrumentation:jaxrs:jaxrs-2.0:jaxrs-2.0-testing") +include(":instrumentation:jaxrs:jaxrs-2.0:jaxrs-2.0-common:testing") include(":instrumentation:jaxrs:jaxrs-2.0:jaxrs-2.0-tomee-testing") include(":instrumentation:jaxrs:jaxrs-2.0:jaxrs-2.0-wildfly-testing") include(":instrumentation:jaxrs-client:jaxrs-client-1.1:javaagent") @@ -194,7 +194,7 @@ include(":instrumentation:jaxws:jaxws-2.0-axis2-1.6:library") include(":instrumentation:jaxws:jaxws-2.0-cxf-3.0:javaagent") include(":instrumentation:jaxws:jaxws-2.0-cxf-3.0:library") include(":instrumentation:jaxws:jaxws-2.0-metro-2.2:javaagent") -include(":instrumentation:jaxws:jaxws-2.0-testing") +include(":instrumentation:jaxws:jaxws-2.0-common-testing") include(":instrumentation:jaxws:jaxws-2.0-tomee-testing") include(":instrumentation:jaxws:jaxws-2.0-wildfly-testing") include(":instrumentation:jaxws:jaxws-common:library") @@ -213,9 +213,9 @@ include(":instrumentation:jetty-httpclient:jetty-httpclient-9.2:testing") include(":instrumentation:jms-1.1:javaagent") include(":instrumentation:jms-1.1:javaagent-unit-tests") include(":instrumentation:jsf:jsf-common:library") -include(":instrumentation:jsf:jsf-testing-common") -include(":instrumentation:jsf:mojarra-1.2:javaagent") -include(":instrumentation:jsf:myfaces-1.2:javaagent") +include(":instrumentation:jsf:jsf-common:testing") +include(":instrumentation:jsf:jsf-mojarra-1.2:javaagent") +include(":instrumentation:jsf:jsf-myfaces-1.2:javaagent") include(":instrumentation:jsp-2.3:javaagent") include(":instrumentation:kafka-clients:kafka-clients-0.11:bootstrap") include(":instrumentation:kafka-clients:kafka-clients-0.11:javaagent") @@ -239,7 +239,7 @@ include(":instrumentation:log4j:log4j-1.2:javaagent") include(":instrumentation:log4j:log4j-2.7:javaagent") include(":instrumentation:log4j:log4j-2.13.2:javaagent") include(":instrumentation:log4j:log4j-2.13.2:library") -include(":instrumentation:log4j:log4j-2-testing") +include(":instrumentation:log4j:log4j-2-common:testing") include(":instrumentation:logback-1.0:javaagent") include(":instrumentation:logback-1.0:library") include(":instrumentation:logback-1.0:testing") @@ -250,7 +250,7 @@ include(":instrumentation:mongo:mongo-3.1:testing") include(":instrumentation:mongo:mongo-3.7:javaagent") include(":instrumentation:mongo:mongo-4.0:javaagent") include(":instrumentation:mongo:mongo-async-3.3:javaagent") -include(":instrumentation:mongo:mongo-testing") +include(":instrumentation:mongo:mongo-common:testing") include(":instrumentation:netty:netty-3.8:javaagent") include(":instrumentation:netty:netty-4.0:javaagent") include(":instrumentation:netty:netty-4.1:library") @@ -274,7 +274,7 @@ include(":instrumentation:play-ws:play-ws-1.0:javaagent") include(":instrumentation:play-ws:play-ws-2.0:javaagent") include(":instrumentation:play-ws:play-ws-2.1:javaagent") include(":instrumentation:play-ws:play-ws-common:javaagent") -include(":instrumentation:play-ws:play-ws-testing") +include(":instrumentation:play-ws:play-ws-common:testing") include(":instrumentation:quartz-2.0:javaagent") include(":instrumentation:quartz-2.0:library") include(":instrumentation:quartz-2.0:testing")