Skip to content

Commit 1b37df7

Browse files
trasktrask
authored
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
1 parent 7998c84 commit 1b37df7

File tree

92 files changed

+39
-39
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

92 files changed

+39
-39
lines changed

‎instrumentation/couchbase/couchbase-2.0/javaagent/build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ dependencies {
3535

3636
library("com.couchbase.client:java-client:2.0.0")
3737

38-
testImplementation(project(":instrumentation:couchbase:couchbase-testing"))
38+
testImplementation(project(":instrumentation:couchbase:couchbase-common:testing"))
3939

4040
latestDepTestLibrary("org.springframework.data:spring-data-couchbase:3.+")
4141
latestDepTestLibrary("com.couchbase.client:java-client:2.+")

‎instrumentation/couchbase/couchbase-2.6/javaagent/build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ dependencies {
2424
library("com.couchbase.client:java-client:2.6.0")
2525

2626
testInstrumentation(project(":instrumentation:couchbase:couchbase-2.0:javaagent"))
27-
testImplementation(project(":instrumentation:couchbase:couchbase-testing"))
27+
testImplementation(project(":instrumentation:couchbase:couchbase-common:testing"))
2828

2929
testLibrary("org.springframework.data:spring-data-couchbase:3.1.0.RELEASE")
3030
testLibrary("com.couchbase.client:encryption:1.0.0")

‎instrumentation/couchbase/couchbase-testing/build.gradle.kts ‎instrumentation/couchbase/couchbase-common/testing/build.gradle.kts

File renamed without changes.

‎instrumentation/couchbase/couchbase-testing/src/main/groovy/AbstractCouchbaseAsyncClientTest.groovy ‎instrumentation/couchbase/couchbase-common/testing/src/main/groovy/AbstractCouchbaseAsyncClientTest.groovy

+1-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ abstract class AbstractCouchbaseAsyncClientTest extends AbstractCouchbaseTest {
4747

4848
environment = envBuilder(bucketSettings).build()
4949
cluster = CouchbaseAsyncCluster.create(environment, Arrays.asList("127.0.0.1"))
50-
manager = cluster.clusterManager(USERNAME, PASSWORD).toBlocking().single()
50+
manager = cluster.clusterManager(AbstractCouchbaseTest.USERNAME, AbstractCouchbaseTest.PASSWORD).toBlocking().single()
5151
type = bucketSettings.type().name()
5252
}
5353

‎instrumentation/couchbase/couchbase-testing/src/main/groovy/AbstractCouchbaseClientTest.groovy ‎instrumentation/couchbase/couchbase-common/testing/src/main/groovy/AbstractCouchbaseClientTest.groovy

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ abstract class AbstractCouchbaseClientTest extends AbstractCouchbaseTest {
3737

3838
environment = envBuilder(bucketSettings).build()
3939
cluster = CouchbaseCluster.create(environment, Arrays.asList("127.0.0.1"))
40-
manager = cluster.clusterManager(USERNAME, PASSWORD)
40+
manager = cluster.clusterManager(AbstractCouchbaseTest.USERNAME, AbstractCouchbaseTest.PASSWORD)
4141
type = bucketSettings.type().name()
4242
}
4343

‎instrumentation/couchbase/couchbase-testing/src/main/groovy/springdata/AbstractCouchbaseSpringRepositoryTest.groovy ‎instrumentation/couchbase/couchbase-common/testing/src/main/groovy/springdata/AbstractCouchbaseSpringRepositoryTest.groovy

File renamed without changes.

‎instrumentation/couchbase/couchbase-testing/src/main/groovy/springdata/AbstractCouchbaseSpringTemplateTest.groovy ‎instrumentation/couchbase/couchbase-common/testing/src/main/groovy/springdata/AbstractCouchbaseSpringTemplateTest.groovy

+2-2
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@ class AbstractCouchbaseSpringTemplateTest extends AbstractCouchbaseTest {
4242

4343
couchbaseCluster = CouchbaseCluster.create(couchbaseEnvironment, Arrays.asList("127.0.0.1"))
4444
memcacheCluster = CouchbaseCluster.create(memcacheEnvironment, Arrays.asList("127.0.0.1"))
45-
ClusterManager couchbaseManager = couchbaseCluster.clusterManager(USERNAME, PASSWORD)
46-
ClusterManager memcacheManager = memcacheCluster.clusterManager(USERNAME, PASSWORD)
45+
ClusterManager couchbaseManager = couchbaseCluster.clusterManager(AbstractCouchbaseTest.USERNAME, AbstractCouchbaseTest.PASSWORD)
46+
ClusterManager memcacheManager = memcacheCluster.clusterManager(AbstractCouchbaseTest.USERNAME, AbstractCouchbaseTest.PASSWORD)
4747

4848
Bucket bucketCouchbase = couchbaseCluster.openBucket(bucketCouchbase.name(), bucketCouchbase.password())
4949
Bucket bucketMemcache = memcacheCluster.openBucket(bucketMemcache.name(), bucketMemcache.password())

‎instrumentation/couchbase/couchbase-testing/src/main/groovy/springdata/CouchbaseConfig.groovy ‎instrumentation/couchbase/couchbase-common/testing/src/main/groovy/springdata/CouchbaseConfig.groovy

File renamed without changes.

‎instrumentation/couchbase/couchbase-testing/src/main/groovy/springdata/Doc.groovy ‎instrumentation/couchbase/couchbase-common/testing/src/main/groovy/springdata/Doc.groovy

File renamed without changes.

‎instrumentation/couchbase/couchbase-testing/src/main/groovy/springdata/DocRepository.groovy ‎instrumentation/couchbase/couchbase-common/testing/src/main/groovy/springdata/DocRepository.groovy

File renamed without changes.

‎instrumentation/couchbase/couchbase-testing/src/main/groovy/util/AbstractCouchbaseTest.groovy ‎instrumentation/couchbase/couchbase-common/testing/src/main/groovy/util/AbstractCouchbaseTest.groovy

File renamed without changes.

‎instrumentation/elasticsearch/elasticsearch-transport-5.0/javaagent/build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ dependencies {
3333
testInstrumentation(project(":instrumentation:apache-httpasyncclient-4.1:javaagent"))
3434
testInstrumentation(project(":instrumentation:netty:netty-4.1:javaagent"))
3535

36-
testImplementation(project(":instrumentation:elasticsearch:elasticsearch-transport-testing"))
36+
testImplementation(project(":instrumentation:elasticsearch:elasticsearch-transport-common:testing"))
3737
testImplementation("org.apache.logging.log4j:log4j-core:2.11.0")
3838
testImplementation("org.apache.logging.log4j:log4j-api:2.11.0")
3939

‎instrumentation/elasticsearch/elasticsearch-transport-5.3/javaagent/build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ dependencies {
3838
testInstrumentation(project(":instrumentation:netty:netty-4.1:javaagent"))
3939
testInstrumentation(project(":instrumentation:spring:spring-data-1.8:javaagent"))
4040

41-
testImplementation(project(":instrumentation:elasticsearch:elasticsearch-transport-testing"))
41+
testImplementation(project(":instrumentation:elasticsearch:elasticsearch-transport-common:testing"))
4242
testImplementation("org.apache.logging.log4j:log4j-core:2.11.0")
4343
testImplementation("org.apache.logging.log4j:log4j-api:2.11.0")
4444

‎instrumentation/elasticsearch/elasticsearch-transport-6.0/javaagent/build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ dependencies {
3535

3636
testLibrary("org.elasticsearch.plugin:transport-netty4-client:6.0.0")
3737

38-
testImplementation(project(":instrumentation:elasticsearch:elasticsearch-transport-testing"))
38+
testImplementation(project(":instrumentation:elasticsearch:elasticsearch-transport-common:testing"))
3939
testImplementation("org.apache.logging.log4j:log4j-core:2.11.0")
4040
testImplementation("org.apache.logging.log4j:log4j-api:2.11.0")
4141
}

‎instrumentation/elasticsearch/elasticsearch-transport-testing/build.gradle.kts ‎instrumentation/elasticsearch/elasticsearch-transport-common/testing/build.gradle.kts

File renamed without changes.

‎instrumentation/elasticsearch/elasticsearch-transport-testing/src/main/groovy/AbstractElasticsearchClientTest.groovy ‎instrumentation/elasticsearch/elasticsearch-transport-common/testing/src/main/groovy/AbstractElasticsearchClientTest.groovy

File renamed without changes.

‎instrumentation/elasticsearch/elasticsearch-transport-testing/src/main/groovy/AbstractElasticsearchNodeClientTest.groovy ‎instrumentation/elasticsearch/elasticsearch-transport-common/testing/src/main/groovy/AbstractElasticsearchNodeClientTest.groovy

File renamed without changes.

‎instrumentation/elasticsearch/elasticsearch-transport-testing/src/main/groovy/AbstractElasticsearchTransportClientTest.groovy ‎instrumentation/elasticsearch/elasticsearch-transport-common/testing/src/main/groovy/AbstractElasticsearchTransportClientTest.groovy

File renamed without changes.

‎instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-testing/build.gradle.kts ‎instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-common/testing/build.gradle.kts

File renamed without changes.

‎instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-testing/src/main/groovy/JaxRsFilterTest.groovy ‎instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-common/testing/src/main/groovy/JaxRsFilterTest.groovy

File renamed without changes.

‎instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-testing/src/main/groovy/JaxRsHttpServerTest.groovy ‎instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-common/testing/src/main/groovy/JaxRsHttpServerTest.groovy

File renamed without changes.

‎instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-testing/src/main/groovy/JaxRsJettyHttpServerTest.groovy ‎instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-common/testing/src/main/groovy/JaxRsJettyHttpServerTest.groovy

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import org.eclipse.jetty.webapp.WebAppContext
88

99
import static org.eclipse.jetty.util.resource.Resource.newResource
1010

11-
class JaxRsJettyHttpServerTest extends JaxRsHttpServerTest<Server> {
11+
abstract class JaxRsJettyHttpServerTest extends JaxRsHttpServerTest<Server> {
1212

1313
@Override
1414
Server startServer(int port) {

‎instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-testing/src/main/groovy/JaxrsAnnotationsInstrumentationTest.groovy ‎instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-common/testing/src/main/groovy/JaxrsAnnotationsInstrumentationTest.groovy

File renamed without changes.

‎instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-testing/src/main/groovy/test/JaxRsTestResource.groovy ‎instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-common/testing/src/main/groovy/test/JaxRsTestResource.groovy

File renamed without changes.

‎instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-testing/src/main/java/JavaInterfaces.java ‎instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-common/testing/src/main/java/JavaInterfaces.java

File renamed without changes.

‎instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-testing/src/main/java/Resource.java ‎instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-common/testing/src/main/java/Resource.java

File renamed without changes.

‎instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-cxf-3.2/javaagent/build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ dependencies {
3232
testInstrumentation(project(":instrumentation:servlet:servlet-3.0:javaagent"))
3333
testInstrumentation(project(":instrumentation:jetty:jetty-8.0:javaagent"))
3434

35-
testImplementation(project(":instrumentation:jaxrs:jaxrs-2.0:jaxrs-2.0-testing"))
35+
testImplementation(project(":instrumentation:jaxrs:jaxrs-2.0:jaxrs-2.0-common:testing"))
3636
testImplementation("javax.xml.bind:jaxb-api:2.2.3")
3737
testImplementation("org.eclipse.jetty:jetty-webapp:9.4.6.v20170531")
3838

‎instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-jersey-2.0/javaagent/build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ dependencies {
3232
testInstrumentation(project(":instrumentation:servlet:servlet-3.0:javaagent"))
3333
testInstrumentation(project(":instrumentation:servlet:servlet-javax-common:javaagent"))
3434

35-
testImplementation(project(":instrumentation:jaxrs:jaxrs-2.0:jaxrs-2.0-testing"))
35+
testImplementation(project(":instrumentation:jaxrs:jaxrs-2.0:jaxrs-2.0-common:testing"))
3636

3737
// First version with DropwizardTestSupport:
3838
testLibrary("io.dropwizard:dropwizard-testing:0.8.0")

‎instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-resteasy-3.0/javaagent/build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ dependencies {
3434
testInstrumentation(project(":instrumentation:servlet:servlet-3.0:javaagent"))
3535
testInstrumentation(project(":instrumentation:servlet:servlet-javax-common:javaagent"))
3636

37-
testImplementation(project(":instrumentation:jaxrs:jaxrs-2.0:jaxrs-2.0-testing"))
37+
testImplementation(project(":instrumentation:jaxrs:jaxrs-2.0:jaxrs-2.0-common:testing"))
3838
testImplementation("org.eclipse.jetty:jetty-webapp:9.4.6.v20170531")
3939

4040
testLibrary("org.jboss.resteasy:resteasy-undertow:3.0.4.Final") {

‎instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-resteasy-3.1/javaagent/build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ dependencies {
3232
testInstrumentation(project(":instrumentation:servlet:servlet-3.0:javaagent"))
3333
testInstrumentation(project(":instrumentation:servlet:servlet-javax-common:javaagent"))
3434

35-
testImplementation(project(":instrumentation:jaxrs:jaxrs-2.0:jaxrs-2.0-testing"))
35+
testImplementation(project(":instrumentation:jaxrs:jaxrs-2.0:jaxrs-2.0-common:testing"))
3636
testImplementation("org.eclipse.jetty:jetty-webapp:9.4.6.v20170531")
3737

3838
testLibrary("org.jboss.resteasy:resteasy-undertow:3.1.0.Final") {

‎instrumentation/jaxws/jaxws-2.0-axis2-1.6/javaagent/build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ dependencies {
3131
testLibrary("org.apache.axis2:axis2-transport-http:$axis2Version")
3232
testLibrary("org.apache.axis2:axis2-transport-local:$axis2Version")
3333

34-
testImplementation(project(":instrumentation:jaxws:jaxws-2.0-testing"))
34+
testImplementation(project(":instrumentation:jaxws:jaxws-2.0-common-testing"))
3535

3636
testInstrumentation(project(":instrumentation:jaxws:jaxws-2.0:javaagent"))
3737
testInstrumentation(project(":instrumentation:jaxws:jaxws-jws-api-1.1:javaagent"))

‎instrumentation/jaxws/jaxws-2.0-testing/build.gradle.kts ‎instrumentation/jaxws/jaxws-2.0-common-testing/build.gradle.kts

File renamed without changes.

‎instrumentation/jaxws/jaxws-2.0-testing/src/main/groovy/AbstractJaxWsTest.groovy ‎instrumentation/jaxws/jaxws-2.0-common-testing/src/main/groovy/AbstractJaxWsTest.groovy

File renamed without changes.

‎instrumentation/jaxws/jaxws-2.0-testing/src/main/groovy/hello/BaseHelloService.groovy ‎instrumentation/jaxws/jaxws-2.0-common-testing/src/main/groovy/hello/BaseHelloService.groovy

File renamed without changes.

‎instrumentation/jaxws/jaxws-2.0-testing/src/main/groovy/hello/HelloService.groovy ‎instrumentation/jaxws/jaxws-2.0-common-testing/src/main/groovy/hello/HelloService.groovy

File renamed without changes.

‎instrumentation/jaxws/jaxws-2.0-testing/src/main/groovy/hello/HelloServiceImpl.groovy ‎instrumentation/jaxws/jaxws-2.0-common-testing/src/main/groovy/hello/HelloServiceImpl.groovy

File renamed without changes.

‎instrumentation/jaxws/jaxws-2.0-testing/src/main/schema/hello.xsd ‎instrumentation/jaxws/jaxws-2.0-common-testing/src/main/schema/hello.xsd

File renamed without changes.

‎instrumentation/jaxws/jaxws-2.0-cxf-3.0/javaagent/build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ dependencies {
1818
library("org.apache.cxf:cxf-rt-frontend-jaxws:3.0.0")
1919
testLibrary("org.apache.cxf:cxf-rt-transports-http:3.0.0")
2020

21-
testImplementation(project(":instrumentation:jaxws:jaxws-2.0-testing"))
21+
testImplementation(project(":instrumentation:jaxws:jaxws-2.0-common-testing"))
2222

2323
testInstrumentation(project(":instrumentation:jaxws:jaxws-2.0:javaagent"))
2424
testInstrumentation(project(":instrumentation:jaxws:jaxws-jws-api-1.1:javaagent"))

‎instrumentation/jaxws/jaxws-2.0-metro-2.2/javaagent/build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ dependencies {
1919

2020
compileOnly("javax.servlet:javax.servlet-api:3.0.1")
2121

22-
testImplementation(project(":instrumentation:jaxws:jaxws-2.0-testing"))
22+
testImplementation(project(":instrumentation:jaxws:jaxws-2.0-common-testing"))
2323

2424
testInstrumentation(project(":instrumentation:jaxws:jaxws-2.0:javaagent"))
2525
testInstrumentation(project(":instrumentation:jaxws:jaxws-jws-api-1.1:javaagent"))

‎instrumentation/jsf/jsf-testing-common/build.gradle.kts ‎instrumentation/jsf/jsf-common/testing/build.gradle.kts

File renamed without changes.

‎instrumentation/jsf/jsf-testing-common/src/main/groovy/BaseJsfTest.groovy ‎instrumentation/jsf/jsf-common/testing/src/main/groovy/BaseJsfTest.groovy

File renamed without changes.

‎instrumentation/jsf/jsf-testing-common/src/main/groovy/ExceptionFilter.groovy ‎instrumentation/jsf/jsf-common/testing/src/main/groovy/ExceptionFilter.groovy

File renamed without changes.

‎instrumentation/jsf/jsf-testing-common/src/main/groovy/GreetingForm.groovy ‎instrumentation/jsf/jsf-common/testing/src/main/groovy/GreetingForm.groovy

File renamed without changes.

‎instrumentation/jsf/jsf-testing-common/src/main/resources/test-app-1.2/WEB-INF/faces-config.xml ‎instrumentation/jsf/jsf-common/testing/src/main/resources/test-app-1.2/WEB-INF/faces-config.xml

File renamed without changes.

‎instrumentation/jsf/jsf-testing-common/src/main/resources/test-app-1.2/WEB-INF/web.xml ‎instrumentation/jsf/jsf-common/testing/src/main/resources/test-app-1.2/WEB-INF/web.xml

File renamed without changes.

‎instrumentation/jsf/jsf-testing-common/src/main/resources/test-app-1.2/greeting.xhtml ‎instrumentation/jsf/jsf-common/testing/src/main/resources/test-app-1.2/greeting.xhtml

File renamed without changes.

‎instrumentation/jsf/jsf-testing-common/src/main/resources/test-app-1.2/hello.xhtml ‎instrumentation/jsf/jsf-common/testing/src/main/resources/test-app-1.2/hello.xhtml

File renamed without changes.

‎instrumentation/jsf/jsf-testing-common/src/main/resources/test-app-2/WEB-INF/faces-config.xml ‎instrumentation/jsf/jsf-common/testing/src/main/resources/test-app-2/WEB-INF/faces-config.xml

File renamed without changes.

‎instrumentation/jsf/jsf-testing-common/src/main/resources/test-app-2/WEB-INF/web.xml ‎instrumentation/jsf/jsf-common/testing/src/main/resources/test-app-2/WEB-INF/web.xml

File renamed without changes.

‎instrumentation/jsf/jsf-testing-common/src/main/resources/test-app-2/greeting.xhtml ‎instrumentation/jsf/jsf-common/testing/src/main/resources/test-app-2/greeting.xhtml

File renamed without changes.

‎instrumentation/jsf/jsf-testing-common/src/main/resources/test-app-2/hello.xhtml ‎instrumentation/jsf/jsf-common/testing/src/main/resources/test-app-2/hello.xhtml

File renamed without changes.

‎instrumentation/jsf/mojarra-1.2/javaagent/build.gradle.kts ‎instrumentation/jsf/jsf-mojarra-1.2/javaagent/build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ dependencies {
6666

6767
implementation(project(":instrumentation:jsf:jsf-common:library"))
6868

69-
testImplementation(project(":instrumentation:jsf:jsf-testing-common"))
69+
testImplementation(project(":instrumentation:jsf:jsf-common:testing"))
7070
testInstrumentation(project(":instrumentation:servlet:servlet-3.0:javaagent"))
7171
testInstrumentation(project(":instrumentation:servlet:servlet-javax-common:javaagent"))
7272

‎instrumentation/jsf/mojarra-1.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/mojarra/ActionListenerImplInstrumentation.java ‎instrumentation/jsf/jsf-mojarra-1.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/mojarra/ActionListenerImplInstrumentation.java

File renamed without changes.

‎instrumentation/jsf/mojarra-1.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/mojarra/MojarraInstrumentationModule.java ‎instrumentation/jsf/jsf-mojarra-1.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/mojarra/MojarraInstrumentationModule.java

File renamed without changes.

‎instrumentation/jsf/mojarra-1.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/mojarra/MojarraSingletons.java ‎instrumentation/jsf/jsf-mojarra-1.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/mojarra/MojarraSingletons.java

File renamed without changes.

‎instrumentation/jsf/mojarra-1.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/mojarra/RestoreViewPhaseInstrumentation.java ‎instrumentation/jsf/jsf-mojarra-1.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/mojarra/RestoreViewPhaseInstrumentation.java

File renamed without changes.

‎instrumentation/jsf/mojarra-1.2/javaagent/src/mojarra12Test/groovy/Mojarra12Test.groovy ‎instrumentation/jsf/jsf-mojarra-1.2/javaagent/src/mojarra12Test/groovy/Mojarra12Test.groovy

File renamed without changes.

‎instrumentation/jsf/mojarra-1.2/javaagent/src/mojarra12Test/resources/test-app-1.2-extra/META-INF/web-fragment.xml ‎instrumentation/jsf/jsf-mojarra-1.2/javaagent/src/mojarra12Test/resources/test-app-1.2-extra/META-INF/web-fragment.xml

File renamed without changes.

‎instrumentation/jsf/mojarra-1.2/javaagent/src/mojarra2LatestTest/groovy/Mojarra2LatestTest.groovy ‎instrumentation/jsf/jsf-mojarra-1.2/javaagent/src/mojarra2LatestTest/groovy/Mojarra2LatestTest.groovy

File renamed without changes.

‎instrumentation/jsf/mojarra-1.2/javaagent/src/mojarra2Test/groovy/Mojarra2Test.groovy ‎instrumentation/jsf/jsf-mojarra-1.2/javaagent/src/mojarra2Test/groovy/Mojarra2Test.groovy

File renamed without changes.

‎instrumentation/jsf/myfaces-1.2/javaagent/build.gradle.kts ‎instrumentation/jsf/jsf-myfaces-1.2/javaagent/build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ dependencies {
3535

3636
implementation(project(":instrumentation:jsf:jsf-common:library"))
3737

38-
testImplementation(project(":instrumentation:jsf:jsf-testing-common"))
38+
testImplementation(project(":instrumentation:jsf:jsf-common:testing"))
3939
testInstrumentation(project(":instrumentation:servlet:servlet-3.0:javaagent"))
4040
testInstrumentation(project(":instrumentation:servlet:servlet-javax-common:javaagent"))
4141

‎instrumentation/jsf/myfaces-1.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/myfaces/ActionListenerImplInstrumentation.java ‎instrumentation/jsf/jsf-myfaces-1.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/myfaces/ActionListenerImplInstrumentation.java

File renamed without changes.

‎instrumentation/jsf/myfaces-1.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/myfaces/MyFacesErrorCauseExtractor.java ‎instrumentation/jsf/jsf-myfaces-1.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/myfaces/MyFacesErrorCauseExtractor.java

File renamed without changes.

‎instrumentation/jsf/myfaces-1.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/myfaces/MyFacesInstrumentationModule.java ‎instrumentation/jsf/jsf-myfaces-1.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/myfaces/MyFacesInstrumentationModule.java

File renamed without changes.

‎instrumentation/jsf/myfaces-1.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/myfaces/MyFacesSingletons.java ‎instrumentation/jsf/jsf-myfaces-1.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/myfaces/MyFacesSingletons.java

File renamed without changes.

‎instrumentation/jsf/myfaces-1.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/myfaces/RestoreViewExecutorInstrumentation.java ‎instrumentation/jsf/jsf-myfaces-1.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/myfaces/RestoreViewExecutorInstrumentation.java

File renamed without changes.

‎instrumentation/jsf/myfaces-1.2/javaagent/src/myfaces12Test/groovy/Myfaces12Test.groovy ‎instrumentation/jsf/jsf-myfaces-1.2/javaagent/src/myfaces12Test/groovy/Myfaces12Test.groovy

File renamed without changes.

‎instrumentation/jsf/myfaces-1.2/javaagent/src/myfaces12Test/resources/test-app-1.2-extra/META-INF/web-fragment.xml ‎instrumentation/jsf/jsf-myfaces-1.2/javaagent/src/myfaces12Test/resources/test-app-1.2-extra/META-INF/web-fragment.xml

File renamed without changes.

‎instrumentation/jsf/myfaces-1.2/javaagent/src/myfaces2LatestTest/groovy/Myfaces2LatestTest.groovy ‎instrumentation/jsf/jsf-myfaces-1.2/javaagent/src/myfaces2LatestTest/groovy/Myfaces2LatestTest.groovy

File renamed without changes.

‎instrumentation/jsf/myfaces-1.2/javaagent/src/myfaces2LatestTest/resources/test-app-2-extra/META-INF/web-fragment.xml ‎instrumentation/jsf/jsf-myfaces-1.2/javaagent/src/myfaces2LatestTest/resources/test-app-2-extra/META-INF/web-fragment.xml

File renamed without changes.

‎instrumentation/jsf/myfaces-1.2/javaagent/src/myfaces2Test/groovy/Myfaces2Test.groovy ‎instrumentation/jsf/jsf-myfaces-1.2/javaagent/src/myfaces2Test/groovy/Myfaces2Test.groovy

File renamed without changes.

‎instrumentation/jsf/myfaces-1.2/javaagent/src/myfaces2Test/resources/test-app-2-extra/META-INF/web-fragment.xml ‎instrumentation/jsf/jsf-myfaces-1.2/javaagent/src/myfaces2Test/resources/test-app-2-extra/META-INF/web-fragment.xml

File renamed without changes.

‎instrumentation/log4j/log4j-2-testing/build.gradle.kts ‎instrumentation/log4j/log4j-2-common/testing/build.gradle.kts

File renamed without changes.

‎instrumentation/log4j/log4j-2-testing/src/main/groovy/Log4j2Test.groovy ‎instrumentation/log4j/log4j-2-common/testing/src/main/groovy/Log4j2Test.groovy

File renamed without changes.

‎instrumentation/log4j/log4j-2-testing/src/main/java/io/opentelemetry/instrumentation/log4j/v2_13_2/ListAppender.java ‎instrumentation/log4j/log4j-2-common/testing/src/main/java/io/opentelemetry/instrumentation/log4j/v2_13_2/ListAppender.java

File renamed without changes.

‎instrumentation/log4j/log4j-2-testing/src/main/resources/log4j2-test.xml ‎instrumentation/log4j/log4j-2-common/testing/src/main/resources/log4j2-test.xml

File renamed without changes.

‎instrumentation/log4j/log4j-2.13.2/javaagent/build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ dependencies {
2525

2626
implementation(project(":instrumentation:log4j:log4j-2.13.2:library"))
2727

28-
testImplementation(project(":instrumentation:log4j:log4j-2-testing"))
28+
testImplementation(project(":instrumentation:log4j:log4j-2-common:testing"))
2929
}
3030

3131
tasks {

‎instrumentation/log4j/log4j-2.13.2/library/build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,5 @@ dependencies {
99
// around it.
1010
testLibrary("org.apache.logging.log4j:log4j-core:2.13.3")
1111

12-
testImplementation(project(":instrumentation:log4j:log4j-2-testing"))
12+
testImplementation(project(":instrumentation:log4j:log4j-2-common:testing"))
1313
}

‎instrumentation/log4j/log4j-2.7/javaagent/build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ muzzle {
1414
dependencies {
1515
library("org.apache.logging.log4j:log4j-core:2.7")
1616

17-
testImplementation(project(":instrumentation:log4j:log4j-2-testing"))
17+
testImplementation(project(":instrumentation:log4j:log4j-2-common:testing"))
1818

1919
latestDepTestLibrary("org.apache.logging.log4j:log4j-core:2.13.1")
2020
}

‎instrumentation/mongo/mongo-3.1/testing/build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ plugins {
33
}
44

55
dependencies {
6-
api(project(":instrumentation:mongo:mongo-testing"))
6+
api(project(":instrumentation:mongo:mongo-common:testing"))
77

88
compileOnly("org.mongodb:mongo-java-driver:3.1.0")
99

‎instrumentation/mongo/mongo-3.7/javaagent/build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ dependencies {
2626
// a couple of test attribute verifications don't pass until 3.8.0
2727
library("org.mongodb:mongo-java-driver:3.8.0")
2828

29-
testImplementation(project(":instrumentation:mongo:mongo-testing"))
29+
testImplementation(project(":instrumentation:mongo:mongo-common:testing"))
3030
}
3131

3232
tasks {

‎instrumentation/mongo/mongo-4.0/javaagent/build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ dependencies {
1919
testLibrary("org.mongodb:mongodb-driver-sync:4.0.0")
2020
testLibrary("org.mongodb:mongodb-driver-reactivestreams:4.0.0")
2121

22-
testImplementation(project(":instrumentation:mongo:mongo-testing"))
22+
testImplementation(project(":instrumentation:mongo:mongo-common:testing"))
2323
testImplementation("de.flapdoodle.embed:de.flapdoodle.embed.mongo:1.50.5")
2424
}
2525

‎instrumentation/mongo/mongo-async-3.3/javaagent/build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ dependencies {
1717

1818
library("org.mongodb:mongodb-driver-async:3.3.0")
1919

20-
testImplementation(project(":instrumentation:mongo:mongo-testing"))
20+
testImplementation(project(":instrumentation:mongo:mongo-common:testing"))
2121

2222
testInstrumentation(project(":instrumentation:mongo:mongo-3.7:javaagent"))
2323
}

‎instrumentation/mongo/mongo-testing/build.gradle.kts ‎instrumentation/mongo/mongo-common/testing/build.gradle.kts

File renamed without changes.

‎instrumentation/mongo/mongo-testing/src/main/groovy/io/opentelemetry/instrumentation/mongo/testing/AbstractMongoClientTest.groovy ‎instrumentation/mongo/mongo-common/testing/src/main/groovy/io/opentelemetry/instrumentation/mongo/testing/AbstractMongoClientTest.groovy

File renamed without changes.

‎instrumentation/play-ws/play-ws-1.0/javaagent/build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ dependencies {
2929

3030
implementation(project(":instrumentation:play-ws:play-ws-common:javaagent"))
3131

32-
testImplementation(project(":instrumentation:play-ws:play-ws-testing"))
32+
testImplementation(project(":instrumentation:play-ws:play-ws-common:testing"))
3333

3434
// These are to ensure cross compatibility
3535
testInstrumentation(project(":instrumentation:netty:netty-4.0:javaagent"))

‎instrumentation/play-ws/play-ws-2.0/javaagent/build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ dependencies {
3535

3636
implementation(project(":instrumentation:play-ws:play-ws-common:javaagent"))
3737

38-
testImplementation(project(":instrumentation:play-ws:play-ws-testing"))
38+
testImplementation(project(":instrumentation:play-ws:play-ws-common:testing"))
3939

4040
// These are to ensure cross compatibility
4141
testInstrumentation(project(":instrumentation:netty:netty-4.0:javaagent"))

‎instrumentation/play-ws/play-ws-2.1/javaagent/build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ dependencies {
3434

3535
implementation(project(":instrumentation:play-ws:play-ws-common:javaagent"))
3636

37-
testImplementation(project(":instrumentation:play-ws:play-ws-testing"))
37+
testImplementation(project(":instrumentation:play-ws:play-ws-common:testing"))
3838

3939
// These are to ensure cross compatibility
4040
testInstrumentation(project(":instrumentation:netty:netty-4.0:javaagent"))

‎instrumentation/play-ws/play-ws-testing/build.gradle.kts ‎instrumentation/play-ws/play-ws-common/testing/build.gradle.kts

File renamed without changes.

‎instrumentation/play-ws/play-ws-testing/src/main/groovy/PlayWsClientTestBase.groovy ‎instrumentation/play-ws/play-ws-common/testing/src/main/groovy/PlayWsClientTestBase.groovy

File renamed without changes.

‎instrumentation/play-ws/play-ws-testing/src/main/groovy/PlayWsClientTestBaseBase.groovy ‎instrumentation/play-ws/play-ws-common/testing/src/main/groovy/PlayWsClientTestBaseBase.groovy

File renamed without changes.

‎settings.gradle.kts

+10-10
Original file line numberDiff line numberDiff line change
@@ -136,15 +136,15 @@ include(":instrumentation:couchbase:couchbase-3.1.6:javaagent")
136136
include(":instrumentation:couchbase:couchbase-3.1.6:tracing-opentelemetry-shaded")
137137
include(":instrumentation:couchbase:couchbase-3.2:javaagent")
138138
include(":instrumentation:couchbase:couchbase-3.2:tracing-opentelemetry-shaded")
139-
include(":instrumentation:couchbase:couchbase-testing")
139+
include(":instrumentation:couchbase:couchbase-common:testing")
140140
include(":instrumentation:dropwizard-views-0.7:javaagent")
141141
include(":instrumentation:dropwizard-testing")
142142
include(":instrumentation:elasticsearch:elasticsearch-rest-common:javaagent")
143143
include(":instrumentation:elasticsearch:elasticsearch-rest-5.0:javaagent")
144144
include(":instrumentation:elasticsearch:elasticsearch-rest-6.4:javaagent")
145145
include(":instrumentation:elasticsearch:elasticsearch-rest-7.0:javaagent")
146146
include(":instrumentation:elasticsearch:elasticsearch-transport-common:library")
147-
include(":instrumentation:elasticsearch:elasticsearch-transport-testing")
147+
include(":instrumentation:elasticsearch:elasticsearch-transport-common:testing")
148148
include(":instrumentation:elasticsearch:elasticsearch-transport-5.0:javaagent")
149149
include(":instrumentation:elasticsearch:elasticsearch-transport-5.3:javaagent")
150150
include(":instrumentation:elasticsearch:elasticsearch-transport-6.0:javaagent")
@@ -179,7 +179,7 @@ include(":instrumentation:jaxrs:jaxrs-2.0:jaxrs-2.0-payara-testing")
179179
include(":instrumentation:jaxrs:jaxrs-2.0:jaxrs-2.0-resteasy-3.0:javaagent")
180180
include(":instrumentation:jaxrs:jaxrs-2.0:jaxrs-2.0-resteasy-3.1:javaagent")
181181
include(":instrumentation:jaxrs:jaxrs-2.0:jaxrs-2.0-resteasy-common:javaagent")
182-
include(":instrumentation:jaxrs:jaxrs-2.0:jaxrs-2.0-testing")
182+
include(":instrumentation:jaxrs:jaxrs-2.0:jaxrs-2.0-common:testing")
183183
include(":instrumentation:jaxrs:jaxrs-2.0:jaxrs-2.0-tomee-testing")
184184
include(":instrumentation:jaxrs:jaxrs-2.0:jaxrs-2.0-wildfly-testing")
185185
include(":instrumentation:jaxrs-client:jaxrs-client-1.1:javaagent")
@@ -194,7 +194,7 @@ include(":instrumentation:jaxws:jaxws-2.0-axis2-1.6:library")
194194
include(":instrumentation:jaxws:jaxws-2.0-cxf-3.0:javaagent")
195195
include(":instrumentation:jaxws:jaxws-2.0-cxf-3.0:library")
196196
include(":instrumentation:jaxws:jaxws-2.0-metro-2.2:javaagent")
197-
include(":instrumentation:jaxws:jaxws-2.0-testing")
197+
include(":instrumentation:jaxws:jaxws-2.0-common-testing")
198198
include(":instrumentation:jaxws:jaxws-2.0-tomee-testing")
199199
include(":instrumentation:jaxws:jaxws-2.0-wildfly-testing")
200200
include(":instrumentation:jaxws:jaxws-common:library")
@@ -213,9 +213,9 @@ include(":instrumentation:jetty-httpclient:jetty-httpclient-9.2:testing")
213213
include(":instrumentation:jms-1.1:javaagent")
214214
include(":instrumentation:jms-1.1:javaagent-unit-tests")
215215
include(":instrumentation:jsf:jsf-common:library")
216-
include(":instrumentation:jsf:jsf-testing-common")
217-
include(":instrumentation:jsf:mojarra-1.2:javaagent")
218-
include(":instrumentation:jsf:myfaces-1.2:javaagent")
216+
include(":instrumentation:jsf:jsf-common:testing")
217+
include(":instrumentation:jsf:jsf-mojarra-1.2:javaagent")
218+
include(":instrumentation:jsf:jsf-myfaces-1.2:javaagent")
219219
include(":instrumentation:jsp-2.3:javaagent")
220220
include(":instrumentation:kafka-clients:kafka-clients-0.11:bootstrap")
221221
include(":instrumentation:kafka-clients:kafka-clients-0.11:javaagent")
@@ -239,7 +239,7 @@ include(":instrumentation:log4j:log4j-1.2:javaagent")
239239
include(":instrumentation:log4j:log4j-2.7:javaagent")
240240
include(":instrumentation:log4j:log4j-2.13.2:javaagent")
241241
include(":instrumentation:log4j:log4j-2.13.2:library")
242-
include(":instrumentation:log4j:log4j-2-testing")
242+
include(":instrumentation:log4j:log4j-2-common:testing")
243243
include(":instrumentation:logback-1.0:javaagent")
244244
include(":instrumentation:logback-1.0:library")
245245
include(":instrumentation:logback-1.0:testing")
@@ -250,7 +250,7 @@ include(":instrumentation:mongo:mongo-3.1:testing")
250250
include(":instrumentation:mongo:mongo-3.7:javaagent")
251251
include(":instrumentation:mongo:mongo-4.0:javaagent")
252252
include(":instrumentation:mongo:mongo-async-3.3:javaagent")
253-
include(":instrumentation:mongo:mongo-testing")
253+
include(":instrumentation:mongo:mongo-common:testing")
254254
include(":instrumentation:netty:netty-3.8:javaagent")
255255
include(":instrumentation:netty:netty-4.0:javaagent")
256256
include(":instrumentation:netty:netty-4.1:library")
@@ -274,7 +274,7 @@ include(":instrumentation:play-ws:play-ws-1.0:javaagent")
274274
include(":instrumentation:play-ws:play-ws-2.0:javaagent")
275275
include(":instrumentation:play-ws:play-ws-2.1:javaagent")
276276
include(":instrumentation:play-ws:play-ws-common:javaagent")
277-
include(":instrumentation:play-ws:play-ws-testing")
277+
include(":instrumentation:play-ws:play-ws-common:testing")
278278
include(":instrumentation:quartz-2.0:javaagent")
279279
include(":instrumentation:quartz-2.0:library")
280280
include(":instrumentation:quartz-2.0:testing")

0 commit comments

Comments
 (0)