Merge branch 'main' of github.com:open-telemetry/opentelemetry-java-i…

…nstrumentation into jetty9-httpclient-pr

instrumentation/external-annotations/javaagent-unit-tests/src/test/groovy/IncludeTest.groovy

@@ -3,11 +3,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import static io.opentelemetry.javaagent.instrumentation.extannotations.TraceAnnotationsInstrumentationModule.DEFAULT_ANNOTATIONS
+import static io.opentelemetry.javaagent.instrumentation.extannotations.ExternalAnnotationInstrumentation.DEFAULT_ANNOTATIONS
 
 import io.opentelemetry.instrumentation.api.config.Config
 import io.opentelemetry.instrumentation.api.config.ConfigBuilder
-import io.opentelemetry.javaagent.instrumentation.extannotations.TraceAnnotationsInstrumentationModule
+import io.opentelemetry.javaagent.instrumentation.extannotations.ExternalAnnotationInstrumentation
 import spock.lang.Specification
 import spock.lang.Unroll
 
@@ -26,7 +26,7 @@ class IncludeTest extends Specification {
     }
 
     expect:
-    TraceAnnotationsInstrumentationModule.AnnotatedMethodsInstrumentation.configureAdditionalTraceAnnotations(config) == expected.toSet()
+    ExternalAnnotationInstrumentation.configureAdditionalTraceAnnotations(config) == expected.toSet()
 
     where:
     value                               | expected

settings.gradle

@@ -318,26 +318,3 @@ include ':benchmark'
 include ':benchmark-integration'
 include ':benchmark-integration:jetty-perftest'
 include ':benchmark-e2e'
-
-def setBuildFile(project) {
-  // javaagent-unittests modules are needed until those projects have library modules
-  // at which time those unittests can be moved to the library modules
-  //
-  // javaagent-integration-tests modules are only needed by "internal-" instrumentation
-  // which needs to be tested by creating some other "test" instrumentation
-  if (['javaagent', 'javaagent-unit-tests', 'javaagent-integration-tests', 'library', 'testing'].contains(project.projectDir.name) && project.path != ':javaagent') {
-    project.buildFileName = "${project.projectDir.parentFile.name}-${project.projectDir.name}.gradle"
-  } else {
-    project.buildFileName = "${project.name}.gradle"
-  }
-  if (!(project.buildFile.exists())) {
-    project.buildFileName += ".kts"
-  }
-  project.children.each {
-    setBuildFile(it)
-  }
-}
-
-rootProject.children.each {
-  setBuildFile(it)
-}