Minor rename of javaagent unit test modules
MODIFY
docs/contributing/writing-instrumentation.md
docs/contributing/writing-instrumentation.md
@@ -128,7 +128,7 @@ Ideally javaagent instrumentation is just a thin wrapper over library instrument
is no need to write unit tests that directly access the javaagent instrumentation classes.
If you still want to write a unit test against javaagent instrumentation, add another module
-named `javaagent-unittests`. Continuing with the example above:
+named `javaagent-unit-tests`. Continuing with the example above:
```
instrumentation ->
@@ -136,8 +136,8 @@ instrumentation ->
yarpc-1.0 ->
javaagent
yarpc-1.0-javaagent.gradle
- javaagent-unittest
- yarpc-1.0-javaagent-unittest.gradle
+ javaagent-unit-tests
+ yarpc-1.0-javaagent-unit-tests.gradle
...
```

RENAME
instrumentation/apache-camel-2.20/javaagent-unittests/apache-camel-2.20-javaagent-unittests.gradle
instrumentation/apache-camel-2.20/javaagent-unit-tests/apache-camel-2.20-javaagent-unit-tests.gradle
RENAME
instrumentation/apache-camel-2.20/javaagent-unittests/src/test/groovy/io/opentelemetry/javaagent/instrumentation/apachecamel/CamelPropagationUtilTest.java
instrumentation/apache-camel-2.20/javaagent-unit-tests/src/test/groovy/io/opentelemetry/javaagent/instrumentation/apachecamel/CamelPropagationUtilTest.java
RENAME
instrumentation/aws-sdk/aws-sdk-1.11/javaagent-unittests/aws-sdk-1.11-javaagent-unittests.gradle
instrumentation/aws-sdk/aws-sdk-1.11/javaagent-unit-tests/aws-sdk-1.11-javaagent-unit-tests.gradle
RENAME
instrumentation/aws-sdk/aws-sdk-1.11/javaagent-unittests/src/test/java/TracingRequestHandlerTest.java
instrumentation/aws-sdk/aws-sdk-1.11/javaagent-unit-tests/src/test/java/TracingRequestHandlerTest.java
RENAME
instrumentation/classloaders/javaagent-unittests/classloaders-javaagent-unittests.gradle
instrumentation/classloaders/javaagent-unit-tests/classloaders-javaagent-unit-tests.gradle
RENAME
instrumentation/classloaders/javaagent-unittests/src/test/groovy/ProxyHelperTest.groovy
instrumentation/classloaders/javaagent-unit-tests/src/test/groovy/ProxyHelperTest.groovy
RENAME
instrumentation/couchbase/couchbase-2.0/javaagent-unittests/couchbase-2.0-javaagent-unittests.gradle
instrumentation/couchbase/couchbase-2.0/javaagent-unit-tests/couchbase-2.0-javaagent-unittests.gradle
RENAME
instrumentation/couchbase/couchbase-2.0/javaagent-unittests/src/test/groovy/io/opentelemetry/javaagent/instrumentation/couchbase/v2_0/CouchbaseQuerySanitizerTest.groovy
instrumentation/couchbase/couchbase-2.0/javaagent-unit-tests/src/test/groovy/io/opentelemetry/javaagent/instrumentation/couchbase/v2_0/CouchbaseQuerySanitizerTest.groovy
RENAME
instrumentation/external-annotations/javaagent-unittests/external-annotations-javaagent-unittests.gradle
instrumentation/external-annotations/javaagent-unit-tests/external-annotations-javaagent-unittests.gradle
RENAME
instrumentation/external-annotations/javaagent-unittests/src/test/groovy/IncludeTest.groovy
instrumentation/external-annotations/javaagent-unit-tests/src/test/groovy/IncludeTest.groovy
RENAME
instrumentation/jdbc/javaagent-unittests/jdbc-javaagent-unittests.gradle
instrumentation/jdbc/javaagent-unit-tests/jdbc-javaagent-unit-tests.gradle
RENAME
instrumentation/jdbc/javaagent-unittests/src/test/groovy/JdbcConnectionUrlParserTest.groovy
instrumentation/jdbc/javaagent-unit-tests/src/test/groovy/JdbcConnectionUrlParserTest.groovy
RENAME
instrumentation/kubernetes-client-7.0/javaagent-unittests/kubernetes-client-7.0-javaagent-unittests.gradle
instrumentation/kubernetes-client-7.0/javaagent-unit-tests/kubernetes-client-7.0-javaagent-unit-tests.gradle
RENAME
instrumentation/kubernetes-client-7.0/javaagent-unittests/src/test/groovy/KubernetesRequestUtilsTest.groovy
instrumentation/kubernetes-client-7.0/javaagent-unit-tests/src/test/groovy/KubernetesRequestUtilsTest.groovy
MODIFY
settings.gradle
settings.gradle
@@ -59,7 +59,7 @@ include ':smoke-tests'
include ':instrumentation:akka-actor-2.5:javaagent'
include ':instrumentation:akka-http-10.0:javaagent'
include ':instrumentation:apache-camel-2.20:javaagent'
-include ':instrumentation:apache-camel-2.20:javaagent-unittests'
+include ':instrumentation:apache-camel-2.20:javaagent-unit-tests'
include ':instrumentation:apache-dubbo:apache-dubbo-2.7:javaagent'
include ':instrumentation:apache-dubbo:apache-dubbo-2.7:library'
include ':instrumentation:apache-dubbo:apache-dubbo-2.7:testing'
@@ -76,7 +76,7 @@ include ':instrumentation:aws-lambda-1.0:javaagent'
include ':instrumentation:aws-lambda-1.0:library'
include ':instrumentation:aws-lambda-1.0:testing'
include ':instrumentation:aws-sdk:aws-sdk-1.11:javaagent'
-include ':instrumentation:aws-sdk:aws-sdk-1.11:javaagent-unittests'
+include ':instrumentation:aws-sdk:aws-sdk-1.11:javaagent-unit-tests'
include ':instrumentation:aws-sdk:aws-sdk-1.11:library'
include ':instrumentation:aws-sdk:aws-sdk-1.11:testing'
include ':instrumentation:aws-sdk:aws-sdk-2.2:javaagent'
@@ -87,9 +87,9 @@ include ':instrumentation:cassandra:cassandra-4.0:javaagent'
include ':instrumentation:cdi-testing'
include ':instrumentation:classloaders:javaagent'
include ':instrumentation:classloaders:javaagent-integration-tests'
-include ':instrumentation:classloaders:javaagent-unittests'
+include ':instrumentation:classloaders:javaagent-unit-tests'
include ':instrumentation:couchbase:couchbase-2.0:javaagent'
-include ':instrumentation:couchbase:couchbase-2.0:javaagent-unittests'
+include ':instrumentation:couchbase:couchbase-2.0:javaagent-unit-tests'
include ':instrumentation:couchbase:couchbase-2.6:javaagent'
include ':instrumentation:couchbase:couchbase-3.1:javaagent'
include ':instrumentation:couchbase:couchbase-testing'
@@ -106,7 +106,7 @@ include ':instrumentation:elasticsearch:elasticsearch-transport-5.3:javaagent'
include ':instrumentation:elasticsearch:elasticsearch-transport-6.0:javaagent'
include ':instrumentation:executors:javaagent'
include ':instrumentation:external-annotations:javaagent'
-include ':instrumentation:external-annotations:javaagent-unittests'
+include ':instrumentation:external-annotations:javaagent-unit-tests'
include ':instrumentation:finatra-2.9:javaagent'
include ':instrumentation:geode-1.4:javaagent'
include ':instrumentation:google-http-client-1.19:javaagent'
@@ -147,7 +147,7 @@ include ':instrumentation:jaxws:jaxws-2.0-testing'
include ':instrumentation:jaxws:jaxws-common:library'
include ':instrumentation:jaxws:jws-1.1:javaagent'
include ':instrumentation:jdbc:javaagent'
-include ':instrumentation:jdbc:javaagent-unittests'
+include ':instrumentation:jdbc:javaagent-unit-tests'
include ':instrumentation:jedis:jedis-1.4:javaagent'
include ':instrumentation:jedis:jedis-3.0:javaagent'
include ':instrumentation:jetty:jetty-8.0:javaagent'
@@ -164,7 +164,7 @@ include ':instrumentation:kafka-streams-0.11:javaagent'
include ':instrumentation:khttp-0.1:javaagent'
include ':instrumentation:kotlinx-coroutines:javaagent'
include ':instrumentation:kubernetes-client-7.0:javaagent'
-include ':instrumentation:kubernetes-client-7.0:javaagent-unittests'
+include ':instrumentation:kubernetes-client-7.0:javaagent-unit-tests'
include ':instrumentation:lettuce:lettuce-common:library'
include ':instrumentation:lettuce:lettuce-4.0:javaagent'
include ':instrumentation:lettuce:lettuce-5.0:javaagent'
@@ -277,9 +277,9 @@ include ':benchmark-integration:jetty-perftest'
include ':benchmark-e2e'
def setBuildFile(project) {
- // javaagent-unittests modules are needed until those projects have library modules
+ // javaagent-unit-tests modules are needed until those projects have library modules
// at which time those unit tests can be moved to the library modules
- if (['javaagent', 'javaagent-unittests', 'library', 'testing'].contains(project.projectDir.name) && project.path != ':javaagent') {
+ if (['javaagent', 'javaagent-unit-tests', 'library', 'testing'].contains(project.projectDir.name) && project.path != ':javaagent') {
project.buildFileName = "${project.projectDir.parentFile.name}-${project.projectDir.name}.gradle"
} else {
project.buildFileName = "${project.name}.gradle"

Minor rename of javaagent unit test modules (#2784)