From f2ed9bfbcc56ac64bad417a85d61b795a72f0412 Mon Sep 17 00:00:00 2001 From: Trask Stalnaker Date: Thu, 5 May 2022 08:54:48 -0700 Subject: [PATCH] Consolidate jboss-logmanager directories (#5983) --- instrumentation/java-util-logging/javaagent/build.gradle.kts | 2 +- .../jboss-logmanager-1.1/javaagent/build.gradle.kts | 0 .../jbosslogmanager/v1_1/JbossLogmanagerInstrumentation.java | 0 .../v1_1/JbossLogmanagerInstrumentationModule.java | 0 .../jbosslogmanager/v1_1/LoggingEventMapper.java | 0 .../javaagent/src/test/groovy/JbossLogmanagerTest.groovy | 0 .../jboss-logmanager-mdc-1.1/javaagent/build.gradle.kts | 0 .../v1_1/JbossExtLogRecordInstrumentation.java | 0 .../jbosslogmanager/v1_1/JbossLoggerInstrumentation.java | 0 .../v1_1/JbossLogmanagerInstrumentationModule.java | 0 .../javaagent/src/test/groovy/JbossLogmanagerMdcTest.groovy | 0 settings.gradle.kts | 4 ++-- 12 files changed, 3 insertions(+), 3 deletions(-) rename instrumentation/{ => jboss-logmanager}/jboss-logmanager-1.1/javaagent/build.gradle.kts (100%) rename instrumentation/{ => jboss-logmanager}/jboss-logmanager-1.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jbosslogmanager/v1_1/JbossLogmanagerInstrumentation.java (100%) rename instrumentation/{ => jboss-logmanager}/jboss-logmanager-1.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jbosslogmanager/v1_1/JbossLogmanagerInstrumentationModule.java (100%) rename instrumentation/{ => jboss-logmanager}/jboss-logmanager-1.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jbosslogmanager/v1_1/LoggingEventMapper.java (100%) rename instrumentation/{ => jboss-logmanager}/jboss-logmanager-1.1/javaagent/src/test/groovy/JbossLogmanagerTest.groovy (100%) rename instrumentation/{ => jboss-logmanager}/jboss-logmanager-mdc-1.1/javaagent/build.gradle.kts (100%) rename instrumentation/{ => jboss-logmanager}/jboss-logmanager-mdc-1.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jbosslogmanager/v1_1/JbossExtLogRecordInstrumentation.java (100%) rename instrumentation/{ => jboss-logmanager}/jboss-logmanager-mdc-1.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jbosslogmanager/v1_1/JbossLoggerInstrumentation.java (100%) rename instrumentation/{ => jboss-logmanager}/jboss-logmanager-mdc-1.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jbosslogmanager/v1_1/JbossLogmanagerInstrumentationModule.java (100%) rename instrumentation/{ => jboss-logmanager}/jboss-logmanager-mdc-1.1/javaagent/src/test/groovy/JbossLogmanagerMdcTest.groovy (100%) diff --git a/instrumentation/java-util-logging/javaagent/build.gradle.kts b/instrumentation/java-util-logging/javaagent/build.gradle.kts index cd68b903c0..f7dba2f46a 100644 --- a/instrumentation/java-util-logging/javaagent/build.gradle.kts +++ b/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") } diff --git a/instrumentation/jboss-logmanager-1.1/javaagent/build.gradle.kts b/instrumentation/jboss-logmanager/jboss-logmanager-1.1/javaagent/build.gradle.kts similarity index 100% rename from instrumentation/jboss-logmanager-1.1/javaagent/build.gradle.kts rename to instrumentation/jboss-logmanager/jboss-logmanager-1.1/javaagent/build.gradle.kts diff --git a/instrumentation/jboss-logmanager-1.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jbosslogmanager/v1_1/JbossLogmanagerInstrumentation.java b/instrumentation/jboss-logmanager/jboss-logmanager-1.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jbosslogmanager/v1_1/JbossLogmanagerInstrumentation.java similarity index 100% rename from instrumentation/jboss-logmanager-1.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jbosslogmanager/v1_1/JbossLogmanagerInstrumentation.java rename to instrumentation/jboss-logmanager/jboss-logmanager-1.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jbosslogmanager/v1_1/JbossLogmanagerInstrumentation.java diff --git a/instrumentation/jboss-logmanager-1.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jbosslogmanager/v1_1/JbossLogmanagerInstrumentationModule.java b/instrumentation/jboss-logmanager/jboss-logmanager-1.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jbosslogmanager/v1_1/JbossLogmanagerInstrumentationModule.java similarity index 100% rename from instrumentation/jboss-logmanager-1.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jbosslogmanager/v1_1/JbossLogmanagerInstrumentationModule.java rename to instrumentation/jboss-logmanager/jboss-logmanager-1.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jbosslogmanager/v1_1/JbossLogmanagerInstrumentationModule.java diff --git a/instrumentation/jboss-logmanager-1.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jbosslogmanager/v1_1/LoggingEventMapper.java b/instrumentation/jboss-logmanager/jboss-logmanager-1.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jbosslogmanager/v1_1/LoggingEventMapper.java similarity index 100% rename from instrumentation/jboss-logmanager-1.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jbosslogmanager/v1_1/LoggingEventMapper.java rename to instrumentation/jboss-logmanager/jboss-logmanager-1.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jbosslogmanager/v1_1/LoggingEventMapper.java diff --git a/instrumentation/jboss-logmanager-1.1/javaagent/src/test/groovy/JbossLogmanagerTest.groovy b/instrumentation/jboss-logmanager/jboss-logmanager-1.1/javaagent/src/test/groovy/JbossLogmanagerTest.groovy similarity index 100% rename from instrumentation/jboss-logmanager-1.1/javaagent/src/test/groovy/JbossLogmanagerTest.groovy rename to instrumentation/jboss-logmanager/jboss-logmanager-1.1/javaagent/src/test/groovy/JbossLogmanagerTest.groovy diff --git a/instrumentation/jboss-logmanager-mdc-1.1/javaagent/build.gradle.kts b/instrumentation/jboss-logmanager/jboss-logmanager-mdc-1.1/javaagent/build.gradle.kts similarity index 100% rename from instrumentation/jboss-logmanager-mdc-1.1/javaagent/build.gradle.kts rename to instrumentation/jboss-logmanager/jboss-logmanager-mdc-1.1/javaagent/build.gradle.kts diff --git a/instrumentation/jboss-logmanager-mdc-1.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jbosslogmanager/v1_1/JbossExtLogRecordInstrumentation.java b/instrumentation/jboss-logmanager/jboss-logmanager-mdc-1.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jbosslogmanager/v1_1/JbossExtLogRecordInstrumentation.java similarity index 100% rename from instrumentation/jboss-logmanager-mdc-1.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jbosslogmanager/v1_1/JbossExtLogRecordInstrumentation.java rename to instrumentation/jboss-logmanager/jboss-logmanager-mdc-1.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jbosslogmanager/v1_1/JbossExtLogRecordInstrumentation.java diff --git a/instrumentation/jboss-logmanager-mdc-1.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jbosslogmanager/v1_1/JbossLoggerInstrumentation.java b/instrumentation/jboss-logmanager/jboss-logmanager-mdc-1.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jbosslogmanager/v1_1/JbossLoggerInstrumentation.java similarity index 100% rename from instrumentation/jboss-logmanager-mdc-1.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jbosslogmanager/v1_1/JbossLoggerInstrumentation.java rename to instrumentation/jboss-logmanager/jboss-logmanager-mdc-1.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jbosslogmanager/v1_1/JbossLoggerInstrumentation.java diff --git a/instrumentation/jboss-logmanager-mdc-1.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jbosslogmanager/v1_1/JbossLogmanagerInstrumentationModule.java b/instrumentation/jboss-logmanager/jboss-logmanager-mdc-1.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jbosslogmanager/v1_1/JbossLogmanagerInstrumentationModule.java similarity index 100% rename from instrumentation/jboss-logmanager-mdc-1.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jbosslogmanager/v1_1/JbossLogmanagerInstrumentationModule.java rename to instrumentation/jboss-logmanager/jboss-logmanager-mdc-1.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jbosslogmanager/v1_1/JbossLogmanagerInstrumentationModule.java diff --git a/instrumentation/jboss-logmanager-mdc-1.1/javaagent/src/test/groovy/JbossLogmanagerMdcTest.groovy b/instrumentation/jboss-logmanager/jboss-logmanager-mdc-1.1/javaagent/src/test/groovy/JbossLogmanagerMdcTest.groovy similarity index 100% rename from instrumentation/jboss-logmanager-mdc-1.1/javaagent/src/test/groovy/JbossLogmanagerMdcTest.groovy rename to instrumentation/jboss-logmanager/jboss-logmanager-mdc-1.1/javaagent/src/test/groovy/JbossLogmanagerMdcTest.groovy diff --git a/settings.gradle.kts b/settings.gradle.kts index 7077078969..cbc8749f6e 100644 --- a/settings.gradle.kts +++ b/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")