Consolidate jboss-logmanager directories
MODIFY
instrumentation/java-util-logging/javaagent/build.gradle.kts
instrumentation/java-util-logging/javaagent/build.gradle.kts
@@ -9,7 +9,7 @@ dependencies {
compileOnly(project(":javaagent-bootstrap"))
// ensure no cross interference
- testInstrumentation(project(":instrumentation:jboss-logmanager-1.1:javaagent"))
+ testInstrumentation(project(":instrumentation:jboss-logmanager:jboss-logmanager-1.1:javaagent"))
testImplementation("org.awaitility:awaitility")
}

RENAME
instrumentation/jboss-logmanager-1.1/javaagent/build.gradle.kts
instrumentation/jboss-logmanager/jboss-logmanager-1.1/javaagent/build.gradle.kts
RENAME
instrumentation/jboss-logmanager-1.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jbosslogmanager/v1_1/JbossLogmanagerInstrumentation.java
instrumentation/jboss-logmanager/jboss-logmanager-1.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jbosslogmanager/v1_1/JbossLogmanagerInstrumentation.java
RENAME
instrumentation/jboss-logmanager-1.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jbosslogmanager/v1_1/JbossLogmanagerInstrumentationModule.java
instrumentation/jboss-logmanager/jboss-logmanager-1.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jbosslogmanager/v1_1/JbossLogmanagerInstrumentationModule.java
RENAME
instrumentation/jboss-logmanager-1.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jbosslogmanager/v1_1/LoggingEventMapper.java
instrumentation/jboss-logmanager/jboss-logmanager-1.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jbosslogmanager/v1_1/LoggingEventMapper.java
RENAME
instrumentation/jboss-logmanager-1.1/javaagent/src/test/groovy/JbossLogmanagerTest.groovy
instrumentation/jboss-logmanager/jboss-logmanager-1.1/javaagent/src/test/groovy/JbossLogmanagerTest.groovy
RENAME
instrumentation/jboss-logmanager-mdc-1.1/javaagent/build.gradle.kts
instrumentation/jboss-logmanager/jboss-logmanager-mdc-1.1/javaagent/build.gradle.kts
RENAME
instrumentation/jboss-logmanager-mdc-1.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jbosslogmanager/v1_1/JbossExtLogRecordInstrumentation.java
instrumentation/jboss-logmanager/jboss-logmanager-mdc-1.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jbosslogmanager/v1_1/JbossExtLogRecordInstrumentation.java
RENAME
instrumentation/jboss-logmanager-mdc-1.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jbosslogmanager/v1_1/JbossLoggerInstrumentation.java
instrumentation/jboss-logmanager/jboss-logmanager-mdc-1.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jbosslogmanager/v1_1/JbossLoggerInstrumentation.java
RENAME
instrumentation/jboss-logmanager-mdc-1.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jbosslogmanager/v1_1/JbossLogmanagerInstrumentationModule.java
instrumentation/jboss-logmanager/jboss-logmanager-mdc-1.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jbosslogmanager/v1_1/JbossLogmanagerInstrumentationModule.java
RENAME
instrumentation/jboss-logmanager-mdc-1.1/javaagent/src/test/groovy/JbossLogmanagerMdcTest.groovy
instrumentation/jboss-logmanager/jboss-logmanager-mdc-1.1/javaagent/src/test/groovy/JbossLogmanagerMdcTest.groovy
MODIFY
settings.gradle.kts
settings.gradle.kts
@@ -252,8 +252,8 @@ include(":instrumentation:jaxws:jaxws-2.0-tomee-testing")
include(":instrumentation:jaxws:jaxws-2.0-wildfly-testing")
include(":instrumentation:jaxws:jaxws-common:library")
include(":instrumentation:jaxws:jaxws-jws-api-1.1:javaagent")
-include(":instrumentation:jboss-logmanager-1.1:javaagent")
-include(":instrumentation:jboss-logmanager-mdc-1.1:javaagent")
+include(":instrumentation:jboss-logmanager:jboss-logmanager-1.1:javaagent")
+include(":instrumentation:jboss-logmanager:jboss-logmanager-mdc-1.1:javaagent")
include(":instrumentation:jdbc:javaagent")
include(":instrumentation:jdbc:library")
include(":instrumentation:jdbc:testing")

Consolidate jboss-logmanager directories (#5983)