From a9980cd014eb0a7396648b8b8cc80a640dfa4d5f Mon Sep 17 00:00:00 2001 From: Trask Stalnaker Date: Wed, 1 Dec 2021 22:03:12 -0800 Subject: [PATCH] Rename autoconfigure modules (#4779) --- instrumentation/apache-dubbo-2.7/javaagent/build.gradle.kts | 2 +- .../{library => library-autoconfigure}/build.gradle.kts | 0 .../instrumentation/apachedubbo/v2_7/DubboHeadersGetter.java | 0 .../instrumentation/apachedubbo/v2_7/DubboHeadersSetter.java | 0 .../instrumentation/apachedubbo/v2_7/DubboRequest.java | 0 .../apachedubbo/v2_7/DubboRpcAttributesExtractor.java | 0 .../instrumentation/apachedubbo/v2_7/DubboTracing.java | 0 .../instrumentation/apachedubbo/v2_7/DubboTracingBuilder.java | 0 .../instrumentation/apachedubbo/v2_7/OpenTelemetryFilter.java | 0 .../instrumentation/apachedubbo/v2_7/TracingFilter.java | 0 .../v2_7/internal/DubboNetClientAttributesExtractor.java | 0 .../v2_7/internal/DubboNetServerAttributesExtractor.java | 0 .../resources/META-INF/services/org.apache.dubbo.rpc.Filter | 0 .../instrumentation/apachedubbo/v2_7/DubboTest.groovy | 0 instrumentation/log4j/log4j-2.13.2/javaagent/build.gradle.kts | 2 +- .../log4j-2.13.2/{library => library-autoconfigure}/README.md | 0 .../{library => library-autoconfigure}/build.gradle.kts | 0 .../instrumentation/log4j/v2_13_2/LogEventMapper.java | 0 .../instrumentation/log4j/v2_13_2/OpenTelemetryAppender.java | 0 .../log4j/v2_13_2/OpenTelemetryContextDataProvider.java | 0 .../instrumentation/log4j/v2_13_2/OpenTelemetryLog4j.java | 0 .../org.apache.logging.log4j.core.util.ContextDataProvider | 0 .../src/test/groovy/LibraryLog4j2Test.groovy | 0 .../log4j/v2_13_2/OpenTelemetryAppenderConfigTest.java | 0 .../log4j/v2_13_2/OpenTelemetryAppenderTest.java | 0 .../instrumentation/log4j/v2_13_2/OpenTelemetryLog4jTest.java | 0 .../src/test/resources/log4j2-test.xml | 0 settings.gradle.kts | 4 ++-- 28 files changed, 4 insertions(+), 4 deletions(-) rename instrumentation/apache-dubbo-2.7/{library => library-autoconfigure}/build.gradle.kts (100%) rename instrumentation/apache-dubbo-2.7/{library => library-autoconfigure}/src/main/java/io/opentelemetry/instrumentation/apachedubbo/v2_7/DubboHeadersGetter.java (100%) rename instrumentation/apache-dubbo-2.7/{library => library-autoconfigure}/src/main/java/io/opentelemetry/instrumentation/apachedubbo/v2_7/DubboHeadersSetter.java (100%) rename instrumentation/apache-dubbo-2.7/{library => library-autoconfigure}/src/main/java/io/opentelemetry/instrumentation/apachedubbo/v2_7/DubboRequest.java (100%) rename instrumentation/apache-dubbo-2.7/{library => library-autoconfigure}/src/main/java/io/opentelemetry/instrumentation/apachedubbo/v2_7/DubboRpcAttributesExtractor.java (100%) rename instrumentation/apache-dubbo-2.7/{library => library-autoconfigure}/src/main/java/io/opentelemetry/instrumentation/apachedubbo/v2_7/DubboTracing.java (100%) rename instrumentation/apache-dubbo-2.7/{library => library-autoconfigure}/src/main/java/io/opentelemetry/instrumentation/apachedubbo/v2_7/DubboTracingBuilder.java (100%) rename instrumentation/apache-dubbo-2.7/{library => library-autoconfigure}/src/main/java/io/opentelemetry/instrumentation/apachedubbo/v2_7/OpenTelemetryFilter.java (100%) rename instrumentation/apache-dubbo-2.7/{library => library-autoconfigure}/src/main/java/io/opentelemetry/instrumentation/apachedubbo/v2_7/TracingFilter.java (100%) rename instrumentation/apache-dubbo-2.7/{library => library-autoconfigure}/src/main/java/io/opentelemetry/instrumentation/apachedubbo/v2_7/internal/DubboNetClientAttributesExtractor.java (100%) rename instrumentation/apache-dubbo-2.7/{library => library-autoconfigure}/src/main/java/io/opentelemetry/instrumentation/apachedubbo/v2_7/internal/DubboNetServerAttributesExtractor.java (100%) rename instrumentation/apache-dubbo-2.7/{library => library-autoconfigure}/src/main/resources/META-INF/services/org.apache.dubbo.rpc.Filter (100%) rename instrumentation/apache-dubbo-2.7/{library => library-autoconfigure}/src/test/groovy/io/opentelemetry/instrumentation/apachedubbo/v2_7/DubboTest.groovy (100%) rename instrumentation/log4j/log4j-2.13.2/{library => library-autoconfigure}/README.md (100%) rename instrumentation/log4j/log4j-2.13.2/{library => library-autoconfigure}/build.gradle.kts (100%) rename instrumentation/log4j/log4j-2.13.2/{library => library-autoconfigure}/src/main/java/io/opentelemetry/instrumentation/log4j/v2_13_2/LogEventMapper.java (100%) rename instrumentation/log4j/log4j-2.13.2/{library => library-autoconfigure}/src/main/java/io/opentelemetry/instrumentation/log4j/v2_13_2/OpenTelemetryAppender.java (100%) rename instrumentation/log4j/log4j-2.13.2/{library => library-autoconfigure}/src/main/java/io/opentelemetry/instrumentation/log4j/v2_13_2/OpenTelemetryContextDataProvider.java (100%) rename instrumentation/log4j/log4j-2.13.2/{library => library-autoconfigure}/src/main/java/io/opentelemetry/instrumentation/log4j/v2_13_2/OpenTelemetryLog4j.java (100%) rename instrumentation/log4j/log4j-2.13.2/{library => library-autoconfigure}/src/main/resources/META-INF/services/org.apache.logging.log4j.core.util.ContextDataProvider (100%) rename instrumentation/log4j/log4j-2.13.2/{library => library-autoconfigure}/src/test/groovy/LibraryLog4j2Test.groovy (100%) rename instrumentation/log4j/log4j-2.13.2/{library => library-autoconfigure}/src/test/java/io/opentelemetry/instrumentation/log4j/v2_13_2/OpenTelemetryAppenderConfigTest.java (100%) rename instrumentation/log4j/log4j-2.13.2/{library => library-autoconfigure}/src/test/java/io/opentelemetry/instrumentation/log4j/v2_13_2/OpenTelemetryAppenderTest.java (100%) rename instrumentation/log4j/log4j-2.13.2/{library => library-autoconfigure}/src/test/java/io/opentelemetry/instrumentation/log4j/v2_13_2/OpenTelemetryLog4jTest.java (100%) rename instrumentation/log4j/log4j-2.13.2/{library => library-autoconfigure}/src/test/resources/log4j2-test.xml (100%) diff --git a/instrumentation/apache-dubbo-2.7/javaagent/build.gradle.kts b/instrumentation/apache-dubbo-2.7/javaagent/build.gradle.kts index ddbac154e2..c8bf4d5dac 100644 --- a/instrumentation/apache-dubbo-2.7/javaagent/build.gradle.kts +++ b/instrumentation/apache-dubbo-2.7/javaagent/build.gradle.kts @@ -11,7 +11,7 @@ muzzle { } dependencies { - implementation(project(":instrumentation:apache-dubbo-2.7:library")) + implementation(project(":instrumentation:apache-dubbo-2.7:library-autoconfigure")) library("org.apache.dubbo:dubbo:2.7.0") diff --git a/instrumentation/apache-dubbo-2.7/library/build.gradle.kts b/instrumentation/apache-dubbo-2.7/library-autoconfigure/build.gradle.kts similarity index 100% rename from instrumentation/apache-dubbo-2.7/library/build.gradle.kts rename to instrumentation/apache-dubbo-2.7/library-autoconfigure/build.gradle.kts diff --git a/instrumentation/apache-dubbo-2.7/library/src/main/java/io/opentelemetry/instrumentation/apachedubbo/v2_7/DubboHeadersGetter.java b/instrumentation/apache-dubbo-2.7/library-autoconfigure/src/main/java/io/opentelemetry/instrumentation/apachedubbo/v2_7/DubboHeadersGetter.java similarity index 100% rename from instrumentation/apache-dubbo-2.7/library/src/main/java/io/opentelemetry/instrumentation/apachedubbo/v2_7/DubboHeadersGetter.java rename to instrumentation/apache-dubbo-2.7/library-autoconfigure/src/main/java/io/opentelemetry/instrumentation/apachedubbo/v2_7/DubboHeadersGetter.java diff --git a/instrumentation/apache-dubbo-2.7/library/src/main/java/io/opentelemetry/instrumentation/apachedubbo/v2_7/DubboHeadersSetter.java b/instrumentation/apache-dubbo-2.7/library-autoconfigure/src/main/java/io/opentelemetry/instrumentation/apachedubbo/v2_7/DubboHeadersSetter.java similarity index 100% rename from instrumentation/apache-dubbo-2.7/library/src/main/java/io/opentelemetry/instrumentation/apachedubbo/v2_7/DubboHeadersSetter.java rename to instrumentation/apache-dubbo-2.7/library-autoconfigure/src/main/java/io/opentelemetry/instrumentation/apachedubbo/v2_7/DubboHeadersSetter.java diff --git a/instrumentation/apache-dubbo-2.7/library/src/main/java/io/opentelemetry/instrumentation/apachedubbo/v2_7/DubboRequest.java b/instrumentation/apache-dubbo-2.7/library-autoconfigure/src/main/java/io/opentelemetry/instrumentation/apachedubbo/v2_7/DubboRequest.java similarity index 100% rename from instrumentation/apache-dubbo-2.7/library/src/main/java/io/opentelemetry/instrumentation/apachedubbo/v2_7/DubboRequest.java rename to instrumentation/apache-dubbo-2.7/library-autoconfigure/src/main/java/io/opentelemetry/instrumentation/apachedubbo/v2_7/DubboRequest.java diff --git a/instrumentation/apache-dubbo-2.7/library/src/main/java/io/opentelemetry/instrumentation/apachedubbo/v2_7/DubboRpcAttributesExtractor.java b/instrumentation/apache-dubbo-2.7/library-autoconfigure/src/main/java/io/opentelemetry/instrumentation/apachedubbo/v2_7/DubboRpcAttributesExtractor.java similarity index 100% rename from instrumentation/apache-dubbo-2.7/library/src/main/java/io/opentelemetry/instrumentation/apachedubbo/v2_7/DubboRpcAttributesExtractor.java rename to instrumentation/apache-dubbo-2.7/library-autoconfigure/src/main/java/io/opentelemetry/instrumentation/apachedubbo/v2_7/DubboRpcAttributesExtractor.java diff --git a/instrumentation/apache-dubbo-2.7/library/src/main/java/io/opentelemetry/instrumentation/apachedubbo/v2_7/DubboTracing.java b/instrumentation/apache-dubbo-2.7/library-autoconfigure/src/main/java/io/opentelemetry/instrumentation/apachedubbo/v2_7/DubboTracing.java similarity index 100% rename from instrumentation/apache-dubbo-2.7/library/src/main/java/io/opentelemetry/instrumentation/apachedubbo/v2_7/DubboTracing.java rename to instrumentation/apache-dubbo-2.7/library-autoconfigure/src/main/java/io/opentelemetry/instrumentation/apachedubbo/v2_7/DubboTracing.java diff --git a/instrumentation/apache-dubbo-2.7/library/src/main/java/io/opentelemetry/instrumentation/apachedubbo/v2_7/DubboTracingBuilder.java b/instrumentation/apache-dubbo-2.7/library-autoconfigure/src/main/java/io/opentelemetry/instrumentation/apachedubbo/v2_7/DubboTracingBuilder.java similarity index 100% rename from instrumentation/apache-dubbo-2.7/library/src/main/java/io/opentelemetry/instrumentation/apachedubbo/v2_7/DubboTracingBuilder.java rename to instrumentation/apache-dubbo-2.7/library-autoconfigure/src/main/java/io/opentelemetry/instrumentation/apachedubbo/v2_7/DubboTracingBuilder.java diff --git a/instrumentation/apache-dubbo-2.7/library/src/main/java/io/opentelemetry/instrumentation/apachedubbo/v2_7/OpenTelemetryFilter.java b/instrumentation/apache-dubbo-2.7/library-autoconfigure/src/main/java/io/opentelemetry/instrumentation/apachedubbo/v2_7/OpenTelemetryFilter.java similarity index 100% rename from instrumentation/apache-dubbo-2.7/library/src/main/java/io/opentelemetry/instrumentation/apachedubbo/v2_7/OpenTelemetryFilter.java rename to instrumentation/apache-dubbo-2.7/library-autoconfigure/src/main/java/io/opentelemetry/instrumentation/apachedubbo/v2_7/OpenTelemetryFilter.java diff --git a/instrumentation/apache-dubbo-2.7/library/src/main/java/io/opentelemetry/instrumentation/apachedubbo/v2_7/TracingFilter.java b/instrumentation/apache-dubbo-2.7/library-autoconfigure/src/main/java/io/opentelemetry/instrumentation/apachedubbo/v2_7/TracingFilter.java similarity index 100% rename from instrumentation/apache-dubbo-2.7/library/src/main/java/io/opentelemetry/instrumentation/apachedubbo/v2_7/TracingFilter.java rename to instrumentation/apache-dubbo-2.7/library-autoconfigure/src/main/java/io/opentelemetry/instrumentation/apachedubbo/v2_7/TracingFilter.java diff --git a/instrumentation/apache-dubbo-2.7/library/src/main/java/io/opentelemetry/instrumentation/apachedubbo/v2_7/internal/DubboNetClientAttributesExtractor.java b/instrumentation/apache-dubbo-2.7/library-autoconfigure/src/main/java/io/opentelemetry/instrumentation/apachedubbo/v2_7/internal/DubboNetClientAttributesExtractor.java similarity index 100% rename from instrumentation/apache-dubbo-2.7/library/src/main/java/io/opentelemetry/instrumentation/apachedubbo/v2_7/internal/DubboNetClientAttributesExtractor.java rename to instrumentation/apache-dubbo-2.7/library-autoconfigure/src/main/java/io/opentelemetry/instrumentation/apachedubbo/v2_7/internal/DubboNetClientAttributesExtractor.java diff --git a/instrumentation/apache-dubbo-2.7/library/src/main/java/io/opentelemetry/instrumentation/apachedubbo/v2_7/internal/DubboNetServerAttributesExtractor.java b/instrumentation/apache-dubbo-2.7/library-autoconfigure/src/main/java/io/opentelemetry/instrumentation/apachedubbo/v2_7/internal/DubboNetServerAttributesExtractor.java similarity index 100% rename from instrumentation/apache-dubbo-2.7/library/src/main/java/io/opentelemetry/instrumentation/apachedubbo/v2_7/internal/DubboNetServerAttributesExtractor.java rename to instrumentation/apache-dubbo-2.7/library-autoconfigure/src/main/java/io/opentelemetry/instrumentation/apachedubbo/v2_7/internal/DubboNetServerAttributesExtractor.java diff --git a/instrumentation/apache-dubbo-2.7/library/src/main/resources/META-INF/services/org.apache.dubbo.rpc.Filter b/instrumentation/apache-dubbo-2.7/library-autoconfigure/src/main/resources/META-INF/services/org.apache.dubbo.rpc.Filter similarity index 100% rename from instrumentation/apache-dubbo-2.7/library/src/main/resources/META-INF/services/org.apache.dubbo.rpc.Filter rename to instrumentation/apache-dubbo-2.7/library-autoconfigure/src/main/resources/META-INF/services/org.apache.dubbo.rpc.Filter diff --git a/instrumentation/apache-dubbo-2.7/library/src/test/groovy/io/opentelemetry/instrumentation/apachedubbo/v2_7/DubboTest.groovy b/instrumentation/apache-dubbo-2.7/library-autoconfigure/src/test/groovy/io/opentelemetry/instrumentation/apachedubbo/v2_7/DubboTest.groovy similarity index 100% rename from instrumentation/apache-dubbo-2.7/library/src/test/groovy/io/opentelemetry/instrumentation/apachedubbo/v2_7/DubboTest.groovy rename to instrumentation/apache-dubbo-2.7/library-autoconfigure/src/test/groovy/io/opentelemetry/instrumentation/apachedubbo/v2_7/DubboTest.groovy diff --git a/instrumentation/log4j/log4j-2.13.2/javaagent/build.gradle.kts b/instrumentation/log4j/log4j-2.13.2/javaagent/build.gradle.kts index 76f46a206c..d8b573a89f 100644 --- a/instrumentation/log4j/log4j-2.13.2/javaagent/build.gradle.kts +++ b/instrumentation/log4j/log4j-2.13.2/javaagent/build.gradle.kts @@ -23,7 +23,7 @@ testSets { dependencies { library("org.apache.logging.log4j:log4j-core:2.13.2") - implementation(project(":instrumentation:log4j:log4j-2.13.2:library")) + implementation(project(":instrumentation:log4j:log4j-2.13.2:library-autoconfigure")) testImplementation(project(":instrumentation:log4j:log4j-2-common:testing")) } diff --git a/instrumentation/log4j/log4j-2.13.2/library/README.md b/instrumentation/log4j/log4j-2.13.2/library-autoconfigure/README.md similarity index 100% rename from instrumentation/log4j/log4j-2.13.2/library/README.md rename to instrumentation/log4j/log4j-2.13.2/library-autoconfigure/README.md diff --git a/instrumentation/log4j/log4j-2.13.2/library/build.gradle.kts b/instrumentation/log4j/log4j-2.13.2/library-autoconfigure/build.gradle.kts similarity index 100% rename from instrumentation/log4j/log4j-2.13.2/library/build.gradle.kts rename to instrumentation/log4j/log4j-2.13.2/library-autoconfigure/build.gradle.kts diff --git a/instrumentation/log4j/log4j-2.13.2/library/src/main/java/io/opentelemetry/instrumentation/log4j/v2_13_2/LogEventMapper.java b/instrumentation/log4j/log4j-2.13.2/library-autoconfigure/src/main/java/io/opentelemetry/instrumentation/log4j/v2_13_2/LogEventMapper.java similarity index 100% rename from instrumentation/log4j/log4j-2.13.2/library/src/main/java/io/opentelemetry/instrumentation/log4j/v2_13_2/LogEventMapper.java rename to instrumentation/log4j/log4j-2.13.2/library-autoconfigure/src/main/java/io/opentelemetry/instrumentation/log4j/v2_13_2/LogEventMapper.java diff --git a/instrumentation/log4j/log4j-2.13.2/library/src/main/java/io/opentelemetry/instrumentation/log4j/v2_13_2/OpenTelemetryAppender.java b/instrumentation/log4j/log4j-2.13.2/library-autoconfigure/src/main/java/io/opentelemetry/instrumentation/log4j/v2_13_2/OpenTelemetryAppender.java similarity index 100% rename from instrumentation/log4j/log4j-2.13.2/library/src/main/java/io/opentelemetry/instrumentation/log4j/v2_13_2/OpenTelemetryAppender.java rename to instrumentation/log4j/log4j-2.13.2/library-autoconfigure/src/main/java/io/opentelemetry/instrumentation/log4j/v2_13_2/OpenTelemetryAppender.java diff --git a/instrumentation/log4j/log4j-2.13.2/library/src/main/java/io/opentelemetry/instrumentation/log4j/v2_13_2/OpenTelemetryContextDataProvider.java b/instrumentation/log4j/log4j-2.13.2/library-autoconfigure/src/main/java/io/opentelemetry/instrumentation/log4j/v2_13_2/OpenTelemetryContextDataProvider.java similarity index 100% rename from instrumentation/log4j/log4j-2.13.2/library/src/main/java/io/opentelemetry/instrumentation/log4j/v2_13_2/OpenTelemetryContextDataProvider.java rename to instrumentation/log4j/log4j-2.13.2/library-autoconfigure/src/main/java/io/opentelemetry/instrumentation/log4j/v2_13_2/OpenTelemetryContextDataProvider.java diff --git a/instrumentation/log4j/log4j-2.13.2/library/src/main/java/io/opentelemetry/instrumentation/log4j/v2_13_2/OpenTelemetryLog4j.java b/instrumentation/log4j/log4j-2.13.2/library-autoconfigure/src/main/java/io/opentelemetry/instrumentation/log4j/v2_13_2/OpenTelemetryLog4j.java similarity index 100% rename from instrumentation/log4j/log4j-2.13.2/library/src/main/java/io/opentelemetry/instrumentation/log4j/v2_13_2/OpenTelemetryLog4j.java rename to instrumentation/log4j/log4j-2.13.2/library-autoconfigure/src/main/java/io/opentelemetry/instrumentation/log4j/v2_13_2/OpenTelemetryLog4j.java diff --git a/instrumentation/log4j/log4j-2.13.2/library/src/main/resources/META-INF/services/org.apache.logging.log4j.core.util.ContextDataProvider b/instrumentation/log4j/log4j-2.13.2/library-autoconfigure/src/main/resources/META-INF/services/org.apache.logging.log4j.core.util.ContextDataProvider similarity index 100% rename from instrumentation/log4j/log4j-2.13.2/library/src/main/resources/META-INF/services/org.apache.logging.log4j.core.util.ContextDataProvider rename to instrumentation/log4j/log4j-2.13.2/library-autoconfigure/src/main/resources/META-INF/services/org.apache.logging.log4j.core.util.ContextDataProvider diff --git a/instrumentation/log4j/log4j-2.13.2/library/src/test/groovy/LibraryLog4j2Test.groovy b/instrumentation/log4j/log4j-2.13.2/library-autoconfigure/src/test/groovy/LibraryLog4j2Test.groovy similarity index 100% rename from instrumentation/log4j/log4j-2.13.2/library/src/test/groovy/LibraryLog4j2Test.groovy rename to instrumentation/log4j/log4j-2.13.2/library-autoconfigure/src/test/groovy/LibraryLog4j2Test.groovy diff --git a/instrumentation/log4j/log4j-2.13.2/library/src/test/java/io/opentelemetry/instrumentation/log4j/v2_13_2/OpenTelemetryAppenderConfigTest.java b/instrumentation/log4j/log4j-2.13.2/library-autoconfigure/src/test/java/io/opentelemetry/instrumentation/log4j/v2_13_2/OpenTelemetryAppenderConfigTest.java similarity index 100% rename from instrumentation/log4j/log4j-2.13.2/library/src/test/java/io/opentelemetry/instrumentation/log4j/v2_13_2/OpenTelemetryAppenderConfigTest.java rename to instrumentation/log4j/log4j-2.13.2/library-autoconfigure/src/test/java/io/opentelemetry/instrumentation/log4j/v2_13_2/OpenTelemetryAppenderConfigTest.java diff --git a/instrumentation/log4j/log4j-2.13.2/library/src/test/java/io/opentelemetry/instrumentation/log4j/v2_13_2/OpenTelemetryAppenderTest.java b/instrumentation/log4j/log4j-2.13.2/library-autoconfigure/src/test/java/io/opentelemetry/instrumentation/log4j/v2_13_2/OpenTelemetryAppenderTest.java similarity index 100% rename from instrumentation/log4j/log4j-2.13.2/library/src/test/java/io/opentelemetry/instrumentation/log4j/v2_13_2/OpenTelemetryAppenderTest.java rename to instrumentation/log4j/log4j-2.13.2/library-autoconfigure/src/test/java/io/opentelemetry/instrumentation/log4j/v2_13_2/OpenTelemetryAppenderTest.java diff --git a/instrumentation/log4j/log4j-2.13.2/library/src/test/java/io/opentelemetry/instrumentation/log4j/v2_13_2/OpenTelemetryLog4jTest.java b/instrumentation/log4j/log4j-2.13.2/library-autoconfigure/src/test/java/io/opentelemetry/instrumentation/log4j/v2_13_2/OpenTelemetryLog4jTest.java similarity index 100% rename from instrumentation/log4j/log4j-2.13.2/library/src/test/java/io/opentelemetry/instrumentation/log4j/v2_13_2/OpenTelemetryLog4jTest.java rename to instrumentation/log4j/log4j-2.13.2/library-autoconfigure/src/test/java/io/opentelemetry/instrumentation/log4j/v2_13_2/OpenTelemetryLog4jTest.java diff --git a/instrumentation/log4j/log4j-2.13.2/library/src/test/resources/log4j2-test.xml b/instrumentation/log4j/log4j-2.13.2/library-autoconfigure/src/test/resources/log4j2-test.xml similarity index 100% rename from instrumentation/log4j/log4j-2.13.2/library/src/test/resources/log4j2-test.xml rename to instrumentation/log4j/log4j-2.13.2/library-autoconfigure/src/test/resources/log4j2-test.xml diff --git a/settings.gradle.kts b/settings.gradle.kts index de4e75406a..f99bcc1182 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -115,7 +115,7 @@ include(":instrumentation:akka-http-10.0:javaagent") include(":instrumentation:apache-camel-2.20:javaagent") include(":instrumentation:apache-camel-2.20:javaagent-unit-tests") include(":instrumentation:apache-dubbo-2.7:javaagent") -include(":instrumentation:apache-dubbo-2.7:library") +include(":instrumentation:apache-dubbo-2.7:library-autoconfigure") include(":instrumentation:apache-dubbo-2.7:testing") include(":instrumentation:apache-httpasyncclient-4.1:javaagent") include(":instrumentation:apache-httpclient:apache-httpclient-2.0:javaagent") @@ -264,7 +264,7 @@ include(":instrumentation:liberty:liberty-dispatcher:javaagent") include(":instrumentation:log4j:log4j-1.2:javaagent") include(":instrumentation:log4j:log4j-2.7:javaagent") include(":instrumentation:log4j:log4j-2.13.2:javaagent") -include(":instrumentation:log4j:log4j-2.13.2:library") +include(":instrumentation:log4j:log4j-2.13.2:library-autoconfigure") include(":instrumentation:log4j:log4j-2-common:testing") include(":instrumentation:logback-1.0:javaagent") include(":instrumentation:logback-1.0:library")