From 935eeae544e59c7cd5b8b25b01e6a2402344efeb Mon Sep 17 00:00:00 2001 From: Trask Stalnaker Date: Wed, 2 Jun 2021 23:46:52 -0700 Subject: [PATCH] Update folder structure (#3174) * Update apache-dubbo-2.7 folder structure * Update logback-1.0 folder structure --- .../javaagent/apache-dubbo-2.7-javaagent.gradle | 4 ++-- .../apachedubbo/v2_7/DubboInstrumentationModule.java | 0 .../apachedubbo/v2_7/DubboTest.groovy | 0 .../library/apache-dubbo-2.7-library.gradle | 2 +- .../apachedubbo/v2_7/DubboExtractAdapter.java | 0 .../apachedubbo/v2_7/DubboHelper.java | 0 .../apachedubbo/v2_7/DubboInjectAdapter.java | 0 .../apachedubbo/v2_7/DubboTracer.java | 0 .../apachedubbo/v2_7/OpenTelemetryFilter.java | 0 .../META-INF/services/org.apache.dubbo.rpc.Filter | 0 .../apachedubbo/v2_7/DubboTest.groovy | 0 .../testing/apache-dubbo-2.7-testing.gradle | 0 .../apachedubbo/v2_7/AbstractDubboTest.groovy | 0 .../apachedubbo/v2_7/api/HelloService.java | 0 .../apachedubbo/v2_7/impl/HelloServiceImpl.java | 0 .../javaagent/logback-1.0-javaagent.gradle | 4 ++-- .../logback/v1_0/LogbackInstrumentationModule.java | 0 .../logback/v1_0/LoggerInstrumentation.java | 0 .../logback/v1_0/LoggingEventInstrumentation.java | 0 .../instrumentation/logback/v1_0/LogbackTest.groovy | 0 .../javaagent/src/test/resources/logback.xml | 0 .../{logback => }/logback-1.0/library/README.md | 0 .../logback-1.0/library/logback-1.0-library.gradle | 2 +- .../logback/v1_0/LoggingEventWrapper.java | 0 .../logback/v1_0/OpenTelemetryAppender.java | 0 .../logback/v1_0/internal/UnionMap.java | 0 .../instrumentation/logback/v1_0/LogbackTest.groovy | 0 .../logback/v1_0/internal/UnionMapTest.groovy | 0 .../library/src/test/resources/logback.xml | 0 .../logback-1.0/testing/logback-1.0-testing.gradle | 2 +- .../logback/v1_0/AbstractLogbackTest.groovy | 0 settings.gradle | 12 ++++++------ 32 files changed, 13 insertions(+), 13 deletions(-) rename instrumentation/{apache-dubbo => }/apache-dubbo-2.7/javaagent/apache-dubbo-2.7-javaagent.gradle (69%) rename instrumentation/{apache-dubbo => }/apache-dubbo-2.7/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachedubbo/v2_7/DubboInstrumentationModule.java (100%) rename instrumentation/{apache-dubbo => }/apache-dubbo-2.7/javaagent/src/test/groovy/io/opentelemetry/instrumentation/apachedubbo/v2_7/DubboTest.groovy (100%) rename instrumentation/{apache-dubbo => }/apache-dubbo-2.7/library/apache-dubbo-2.7-library.gradle (76%) rename instrumentation/{apache-dubbo => }/apache-dubbo-2.7/library/src/main/java/io/opentelemetry/instrumentation/apachedubbo/v2_7/DubboExtractAdapter.java (100%) rename instrumentation/{apache-dubbo => }/apache-dubbo-2.7/library/src/main/java/io/opentelemetry/instrumentation/apachedubbo/v2_7/DubboHelper.java (100%) rename instrumentation/{apache-dubbo => }/apache-dubbo-2.7/library/src/main/java/io/opentelemetry/instrumentation/apachedubbo/v2_7/DubboInjectAdapter.java (100%) rename instrumentation/{apache-dubbo => }/apache-dubbo-2.7/library/src/main/java/io/opentelemetry/instrumentation/apachedubbo/v2_7/DubboTracer.java (100%) rename instrumentation/{apache-dubbo => }/apache-dubbo-2.7/library/src/main/java/io/opentelemetry/instrumentation/apachedubbo/v2_7/OpenTelemetryFilter.java (100%) rename instrumentation/{apache-dubbo => }/apache-dubbo-2.7/library/src/main/resources/META-INF/services/org.apache.dubbo.rpc.Filter (100%) rename instrumentation/{apache-dubbo => }/apache-dubbo-2.7/library/src/test/groovy/io/opentelemetry/instrumentation/apachedubbo/v2_7/DubboTest.groovy (100%) rename instrumentation/{apache-dubbo => }/apache-dubbo-2.7/testing/apache-dubbo-2.7-testing.gradle (100%) rename instrumentation/{apache-dubbo => }/apache-dubbo-2.7/testing/src/main/groovy/io/opentelemetry/instrumentation/apachedubbo/v2_7/AbstractDubboTest.groovy (100%) rename instrumentation/{apache-dubbo => }/apache-dubbo-2.7/testing/src/main/java/io/opentelemetry/instrumentation/apachedubbo/v2_7/api/HelloService.java (100%) rename instrumentation/{apache-dubbo => }/apache-dubbo-2.7/testing/src/main/java/io/opentelemetry/instrumentation/apachedubbo/v2_7/impl/HelloServiceImpl.java (100%) rename instrumentation/{logback => }/logback-1.0/javaagent/logback-1.0-javaagent.gradle (71%) rename instrumentation/{logback => }/logback-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/logback/v1_0/LogbackInstrumentationModule.java (100%) rename instrumentation/{logback => }/logback-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/logback/v1_0/LoggerInstrumentation.java (100%) rename instrumentation/{logback => }/logback-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/logback/v1_0/LoggingEventInstrumentation.java (100%) rename instrumentation/{logback => }/logback-1.0/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/logback/v1_0/LogbackTest.groovy (100%) rename instrumentation/{logback => }/logback-1.0/javaagent/src/test/resources/logback.xml (100%) rename instrumentation/{logback => }/logback-1.0/library/README.md (100%) rename instrumentation/{logback => }/logback-1.0/library/logback-1.0-library.gradle (77%) rename instrumentation/{logback => }/logback-1.0/library/src/main/java/io/opentelemetry/instrumentation/logback/v1_0/LoggingEventWrapper.java (100%) rename instrumentation/{logback => }/logback-1.0/library/src/main/java/io/opentelemetry/instrumentation/logback/v1_0/OpenTelemetryAppender.java (100%) rename instrumentation/{logback => }/logback-1.0/library/src/main/java/io/opentelemetry/instrumentation/logback/v1_0/internal/UnionMap.java (100%) rename instrumentation/{logback => }/logback-1.0/library/src/test/groovy/io/opentelemetry/instrumentation/logback/v1_0/LogbackTest.groovy (100%) rename instrumentation/{logback => }/logback-1.0/library/src/test/groovy/io/opentelemetry/instrumentation/logback/v1_0/internal/UnionMapTest.groovy (100%) rename instrumentation/{logback => }/logback-1.0/library/src/test/resources/logback.xml (100%) rename instrumentation/{logback => }/logback-1.0/testing/logback-1.0-testing.gradle (93%) rename instrumentation/{logback => }/logback-1.0/testing/src/main/groovy/io/opentelemetry/instrumentation/logback/v1_0/AbstractLogbackTest.groovy (100%) diff --git a/instrumentation/apache-dubbo/apache-dubbo-2.7/javaagent/apache-dubbo-2.7-javaagent.gradle b/instrumentation/apache-dubbo-2.7/javaagent/apache-dubbo-2.7-javaagent.gradle similarity index 69% rename from instrumentation/apache-dubbo/apache-dubbo-2.7/javaagent/apache-dubbo-2.7-javaagent.gradle rename to instrumentation/apache-dubbo-2.7/javaagent/apache-dubbo-2.7-javaagent.gradle index c0f7d6c694..d16238a048 100644 --- a/instrumentation/apache-dubbo/apache-dubbo-2.7/javaagent/apache-dubbo-2.7-javaagent.gradle +++ b/instrumentation/apache-dubbo-2.7/javaagent/apache-dubbo-2.7-javaagent.gradle @@ -9,11 +9,11 @@ muzzle { } dependencies { - implementation project(':instrumentation:apache-dubbo:apache-dubbo-2.7:library') + implementation project(':instrumentation:apache-dubbo-2.7:library') library "org.apache.dubbo:dubbo:2.7.0" - testImplementation project(':instrumentation:apache-dubbo:apache-dubbo-2.7:testing') + testImplementation project(':instrumentation:apache-dubbo-2.7:testing') testLibrary "org.apache.dubbo:dubbo-config-api:2.7.0" latestDepTestLibrary "org.apache.dubbo:dubbo:2.+" diff --git a/instrumentation/apache-dubbo/apache-dubbo-2.7/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachedubbo/v2_7/DubboInstrumentationModule.java b/instrumentation/apache-dubbo-2.7/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachedubbo/v2_7/DubboInstrumentationModule.java similarity index 100% rename from instrumentation/apache-dubbo/apache-dubbo-2.7/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachedubbo/v2_7/DubboInstrumentationModule.java rename to instrumentation/apache-dubbo-2.7/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachedubbo/v2_7/DubboInstrumentationModule.java diff --git a/instrumentation/apache-dubbo/apache-dubbo-2.7/javaagent/src/test/groovy/io/opentelemetry/instrumentation/apachedubbo/v2_7/DubboTest.groovy b/instrumentation/apache-dubbo-2.7/javaagent/src/test/groovy/io/opentelemetry/instrumentation/apachedubbo/v2_7/DubboTest.groovy similarity index 100% rename from instrumentation/apache-dubbo/apache-dubbo-2.7/javaagent/src/test/groovy/io/opentelemetry/instrumentation/apachedubbo/v2_7/DubboTest.groovy rename to instrumentation/apache-dubbo-2.7/javaagent/src/test/groovy/io/opentelemetry/instrumentation/apachedubbo/v2_7/DubboTest.groovy diff --git a/instrumentation/apache-dubbo/apache-dubbo-2.7/library/apache-dubbo-2.7-library.gradle b/instrumentation/apache-dubbo-2.7/library/apache-dubbo-2.7-library.gradle similarity index 76% rename from instrumentation/apache-dubbo/apache-dubbo-2.7/library/apache-dubbo-2.7-library.gradle rename to instrumentation/apache-dubbo-2.7/library/apache-dubbo-2.7-library.gradle index 6bcd731dba..2541be09e4 100644 --- a/instrumentation/apache-dubbo/apache-dubbo-2.7/library/apache-dubbo-2.7-library.gradle +++ b/instrumentation/apache-dubbo-2.7/library/apache-dubbo-2.7-library.gradle @@ -3,7 +3,7 @@ apply from: "$rootDir/gradle/instrumentation-library.gradle" dependencies { library "org.apache.dubbo:dubbo:2.7.0" - testImplementation project(':instrumentation:apache-dubbo:apache-dubbo-2.7:testing') + testImplementation project(':instrumentation:apache-dubbo-2.7:testing') testLibrary "org.apache.dubbo:dubbo-config-api:2.7.0" latestDepTestLibrary "org.apache.dubbo:dubbo:2.+" diff --git a/instrumentation/apache-dubbo/apache-dubbo-2.7/library/src/main/java/io/opentelemetry/instrumentation/apachedubbo/v2_7/DubboExtractAdapter.java b/instrumentation/apache-dubbo-2.7/library/src/main/java/io/opentelemetry/instrumentation/apachedubbo/v2_7/DubboExtractAdapter.java similarity index 100% rename from instrumentation/apache-dubbo/apache-dubbo-2.7/library/src/main/java/io/opentelemetry/instrumentation/apachedubbo/v2_7/DubboExtractAdapter.java rename to instrumentation/apache-dubbo-2.7/library/src/main/java/io/opentelemetry/instrumentation/apachedubbo/v2_7/DubboExtractAdapter.java diff --git a/instrumentation/apache-dubbo/apache-dubbo-2.7/library/src/main/java/io/opentelemetry/instrumentation/apachedubbo/v2_7/DubboHelper.java b/instrumentation/apache-dubbo-2.7/library/src/main/java/io/opentelemetry/instrumentation/apachedubbo/v2_7/DubboHelper.java similarity index 100% rename from instrumentation/apache-dubbo/apache-dubbo-2.7/library/src/main/java/io/opentelemetry/instrumentation/apachedubbo/v2_7/DubboHelper.java rename to instrumentation/apache-dubbo-2.7/library/src/main/java/io/opentelemetry/instrumentation/apachedubbo/v2_7/DubboHelper.java diff --git a/instrumentation/apache-dubbo/apache-dubbo-2.7/library/src/main/java/io/opentelemetry/instrumentation/apachedubbo/v2_7/DubboInjectAdapter.java b/instrumentation/apache-dubbo-2.7/library/src/main/java/io/opentelemetry/instrumentation/apachedubbo/v2_7/DubboInjectAdapter.java similarity index 100% rename from instrumentation/apache-dubbo/apache-dubbo-2.7/library/src/main/java/io/opentelemetry/instrumentation/apachedubbo/v2_7/DubboInjectAdapter.java rename to instrumentation/apache-dubbo-2.7/library/src/main/java/io/opentelemetry/instrumentation/apachedubbo/v2_7/DubboInjectAdapter.java diff --git a/instrumentation/apache-dubbo/apache-dubbo-2.7/library/src/main/java/io/opentelemetry/instrumentation/apachedubbo/v2_7/DubboTracer.java b/instrumentation/apache-dubbo-2.7/library/src/main/java/io/opentelemetry/instrumentation/apachedubbo/v2_7/DubboTracer.java similarity index 100% rename from instrumentation/apache-dubbo/apache-dubbo-2.7/library/src/main/java/io/opentelemetry/instrumentation/apachedubbo/v2_7/DubboTracer.java rename to instrumentation/apache-dubbo-2.7/library/src/main/java/io/opentelemetry/instrumentation/apachedubbo/v2_7/DubboTracer.java diff --git a/instrumentation/apache-dubbo/apache-dubbo-2.7/library/src/main/java/io/opentelemetry/instrumentation/apachedubbo/v2_7/OpenTelemetryFilter.java b/instrumentation/apache-dubbo-2.7/library/src/main/java/io/opentelemetry/instrumentation/apachedubbo/v2_7/OpenTelemetryFilter.java similarity index 100% rename from instrumentation/apache-dubbo/apache-dubbo-2.7/library/src/main/java/io/opentelemetry/instrumentation/apachedubbo/v2_7/OpenTelemetryFilter.java rename to instrumentation/apache-dubbo-2.7/library/src/main/java/io/opentelemetry/instrumentation/apachedubbo/v2_7/OpenTelemetryFilter.java diff --git a/instrumentation/apache-dubbo/apache-dubbo-2.7/library/src/main/resources/META-INF/services/org.apache.dubbo.rpc.Filter b/instrumentation/apache-dubbo-2.7/library/src/main/resources/META-INF/services/org.apache.dubbo.rpc.Filter similarity index 100% rename from instrumentation/apache-dubbo/apache-dubbo-2.7/library/src/main/resources/META-INF/services/org.apache.dubbo.rpc.Filter rename to instrumentation/apache-dubbo-2.7/library/src/main/resources/META-INF/services/org.apache.dubbo.rpc.Filter diff --git a/instrumentation/apache-dubbo/apache-dubbo-2.7/library/src/test/groovy/io/opentelemetry/instrumentation/apachedubbo/v2_7/DubboTest.groovy b/instrumentation/apache-dubbo-2.7/library/src/test/groovy/io/opentelemetry/instrumentation/apachedubbo/v2_7/DubboTest.groovy similarity index 100% rename from instrumentation/apache-dubbo/apache-dubbo-2.7/library/src/test/groovy/io/opentelemetry/instrumentation/apachedubbo/v2_7/DubboTest.groovy rename to instrumentation/apache-dubbo-2.7/library/src/test/groovy/io/opentelemetry/instrumentation/apachedubbo/v2_7/DubboTest.groovy diff --git a/instrumentation/apache-dubbo/apache-dubbo-2.7/testing/apache-dubbo-2.7-testing.gradle b/instrumentation/apache-dubbo-2.7/testing/apache-dubbo-2.7-testing.gradle similarity index 100% rename from instrumentation/apache-dubbo/apache-dubbo-2.7/testing/apache-dubbo-2.7-testing.gradle rename to instrumentation/apache-dubbo-2.7/testing/apache-dubbo-2.7-testing.gradle diff --git a/instrumentation/apache-dubbo/apache-dubbo-2.7/testing/src/main/groovy/io/opentelemetry/instrumentation/apachedubbo/v2_7/AbstractDubboTest.groovy b/instrumentation/apache-dubbo-2.7/testing/src/main/groovy/io/opentelemetry/instrumentation/apachedubbo/v2_7/AbstractDubboTest.groovy similarity index 100% rename from instrumentation/apache-dubbo/apache-dubbo-2.7/testing/src/main/groovy/io/opentelemetry/instrumentation/apachedubbo/v2_7/AbstractDubboTest.groovy rename to instrumentation/apache-dubbo-2.7/testing/src/main/groovy/io/opentelemetry/instrumentation/apachedubbo/v2_7/AbstractDubboTest.groovy diff --git a/instrumentation/apache-dubbo/apache-dubbo-2.7/testing/src/main/java/io/opentelemetry/instrumentation/apachedubbo/v2_7/api/HelloService.java b/instrumentation/apache-dubbo-2.7/testing/src/main/java/io/opentelemetry/instrumentation/apachedubbo/v2_7/api/HelloService.java similarity index 100% rename from instrumentation/apache-dubbo/apache-dubbo-2.7/testing/src/main/java/io/opentelemetry/instrumentation/apachedubbo/v2_7/api/HelloService.java rename to instrumentation/apache-dubbo-2.7/testing/src/main/java/io/opentelemetry/instrumentation/apachedubbo/v2_7/api/HelloService.java diff --git a/instrumentation/apache-dubbo/apache-dubbo-2.7/testing/src/main/java/io/opentelemetry/instrumentation/apachedubbo/v2_7/impl/HelloServiceImpl.java b/instrumentation/apache-dubbo-2.7/testing/src/main/java/io/opentelemetry/instrumentation/apachedubbo/v2_7/impl/HelloServiceImpl.java similarity index 100% rename from instrumentation/apache-dubbo/apache-dubbo-2.7/testing/src/main/java/io/opentelemetry/instrumentation/apachedubbo/v2_7/impl/HelloServiceImpl.java rename to instrumentation/apache-dubbo-2.7/testing/src/main/java/io/opentelemetry/instrumentation/apachedubbo/v2_7/impl/HelloServiceImpl.java diff --git a/instrumentation/logback/logback-1.0/javaagent/logback-1.0-javaagent.gradle b/instrumentation/logback-1.0/javaagent/logback-1.0-javaagent.gradle similarity index 71% rename from instrumentation/logback/logback-1.0/javaagent/logback-1.0-javaagent.gradle rename to instrumentation/logback-1.0/javaagent/logback-1.0-javaagent.gradle index 0eef77bc78..700fb34fd4 100644 --- a/instrumentation/logback/logback-1.0/javaagent/logback-1.0-javaagent.gradle +++ b/instrumentation/logback-1.0/javaagent/logback-1.0-javaagent.gradle @@ -9,11 +9,11 @@ muzzle { } dependencies { - implementation project(':instrumentation:logback:logback-1.0:library') + implementation project(':instrumentation:logback-1.0:library') library "ch.qos.logback:logback-classic:1.0.0" - testImplementation project(':instrumentation:logback:logback-1.0:testing') + testImplementation project(':instrumentation:logback-1.0:testing') // 1.3+ contains breaking changes, check back after it stabilizes. latestDepTestLibrary "ch.qos.logback:logback-classic:1.2.+" diff --git a/instrumentation/logback/logback-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/logback/v1_0/LogbackInstrumentationModule.java b/instrumentation/logback-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/logback/v1_0/LogbackInstrumentationModule.java similarity index 100% rename from instrumentation/logback/logback-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/logback/v1_0/LogbackInstrumentationModule.java rename to instrumentation/logback-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/logback/v1_0/LogbackInstrumentationModule.java diff --git a/instrumentation/logback/logback-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/logback/v1_0/LoggerInstrumentation.java b/instrumentation/logback-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/logback/v1_0/LoggerInstrumentation.java similarity index 100% rename from instrumentation/logback/logback-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/logback/v1_0/LoggerInstrumentation.java rename to instrumentation/logback-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/logback/v1_0/LoggerInstrumentation.java diff --git a/instrumentation/logback/logback-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/logback/v1_0/LoggingEventInstrumentation.java b/instrumentation/logback-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/logback/v1_0/LoggingEventInstrumentation.java similarity index 100% rename from instrumentation/logback/logback-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/logback/v1_0/LoggingEventInstrumentation.java rename to instrumentation/logback-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/logback/v1_0/LoggingEventInstrumentation.java diff --git a/instrumentation/logback/logback-1.0/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/logback/v1_0/LogbackTest.groovy b/instrumentation/logback-1.0/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/logback/v1_0/LogbackTest.groovy similarity index 100% rename from instrumentation/logback/logback-1.0/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/logback/v1_0/LogbackTest.groovy rename to instrumentation/logback-1.0/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/logback/v1_0/LogbackTest.groovy diff --git a/instrumentation/logback/logback-1.0/javaagent/src/test/resources/logback.xml b/instrumentation/logback-1.0/javaagent/src/test/resources/logback.xml similarity index 100% rename from instrumentation/logback/logback-1.0/javaagent/src/test/resources/logback.xml rename to instrumentation/logback-1.0/javaagent/src/test/resources/logback.xml diff --git a/instrumentation/logback/logback-1.0/library/README.md b/instrumentation/logback-1.0/library/README.md similarity index 100% rename from instrumentation/logback/logback-1.0/library/README.md rename to instrumentation/logback-1.0/library/README.md diff --git a/instrumentation/logback/logback-1.0/library/logback-1.0-library.gradle b/instrumentation/logback-1.0/library/logback-1.0-library.gradle similarity index 77% rename from instrumentation/logback/logback-1.0/library/logback-1.0-library.gradle rename to instrumentation/logback-1.0/library/logback-1.0-library.gradle index 47d56527a8..619f6e3baf 100644 --- a/instrumentation/logback/logback-1.0/library/logback-1.0-library.gradle +++ b/instrumentation/logback-1.0/library/logback-1.0-library.gradle @@ -3,7 +3,7 @@ apply from: "$rootDir/gradle/instrumentation-library.gradle" dependencies { library "ch.qos.logback:logback-classic:1.0.0" - testImplementation project(':instrumentation:logback:logback-1.0:testing') + testImplementation project(':instrumentation:logback-1.0:testing') // 1.3+ contains breaking changes, check back after it stabilizes. latestDepTestLibrary "ch.qos.logback:logback-classic:1.2.+" diff --git a/instrumentation/logback/logback-1.0/library/src/main/java/io/opentelemetry/instrumentation/logback/v1_0/LoggingEventWrapper.java b/instrumentation/logback-1.0/library/src/main/java/io/opentelemetry/instrumentation/logback/v1_0/LoggingEventWrapper.java similarity index 100% rename from instrumentation/logback/logback-1.0/library/src/main/java/io/opentelemetry/instrumentation/logback/v1_0/LoggingEventWrapper.java rename to instrumentation/logback-1.0/library/src/main/java/io/opentelemetry/instrumentation/logback/v1_0/LoggingEventWrapper.java diff --git a/instrumentation/logback/logback-1.0/library/src/main/java/io/opentelemetry/instrumentation/logback/v1_0/OpenTelemetryAppender.java b/instrumentation/logback-1.0/library/src/main/java/io/opentelemetry/instrumentation/logback/v1_0/OpenTelemetryAppender.java similarity index 100% rename from instrumentation/logback/logback-1.0/library/src/main/java/io/opentelemetry/instrumentation/logback/v1_0/OpenTelemetryAppender.java rename to instrumentation/logback-1.0/library/src/main/java/io/opentelemetry/instrumentation/logback/v1_0/OpenTelemetryAppender.java diff --git a/instrumentation/logback/logback-1.0/library/src/main/java/io/opentelemetry/instrumentation/logback/v1_0/internal/UnionMap.java b/instrumentation/logback-1.0/library/src/main/java/io/opentelemetry/instrumentation/logback/v1_0/internal/UnionMap.java similarity index 100% rename from instrumentation/logback/logback-1.0/library/src/main/java/io/opentelemetry/instrumentation/logback/v1_0/internal/UnionMap.java rename to instrumentation/logback-1.0/library/src/main/java/io/opentelemetry/instrumentation/logback/v1_0/internal/UnionMap.java diff --git a/instrumentation/logback/logback-1.0/library/src/test/groovy/io/opentelemetry/instrumentation/logback/v1_0/LogbackTest.groovy b/instrumentation/logback-1.0/library/src/test/groovy/io/opentelemetry/instrumentation/logback/v1_0/LogbackTest.groovy similarity index 100% rename from instrumentation/logback/logback-1.0/library/src/test/groovy/io/opentelemetry/instrumentation/logback/v1_0/LogbackTest.groovy rename to instrumentation/logback-1.0/library/src/test/groovy/io/opentelemetry/instrumentation/logback/v1_0/LogbackTest.groovy diff --git a/instrumentation/logback/logback-1.0/library/src/test/groovy/io/opentelemetry/instrumentation/logback/v1_0/internal/UnionMapTest.groovy b/instrumentation/logback-1.0/library/src/test/groovy/io/opentelemetry/instrumentation/logback/v1_0/internal/UnionMapTest.groovy similarity index 100% rename from instrumentation/logback/logback-1.0/library/src/test/groovy/io/opentelemetry/instrumentation/logback/v1_0/internal/UnionMapTest.groovy rename to instrumentation/logback-1.0/library/src/test/groovy/io/opentelemetry/instrumentation/logback/v1_0/internal/UnionMapTest.groovy diff --git a/instrumentation/logback/logback-1.0/library/src/test/resources/logback.xml b/instrumentation/logback-1.0/library/src/test/resources/logback.xml similarity index 100% rename from instrumentation/logback/logback-1.0/library/src/test/resources/logback.xml rename to instrumentation/logback-1.0/library/src/test/resources/logback.xml diff --git a/instrumentation/logback/logback-1.0/testing/logback-1.0-testing.gradle b/instrumentation/logback-1.0/testing/logback-1.0-testing.gradle similarity index 93% rename from instrumentation/logback/logback-1.0/testing/logback-1.0-testing.gradle rename to instrumentation/logback-1.0/testing/logback-1.0-testing.gradle index 1c8d7e4742..e20a2a0e8e 100644 --- a/instrumentation/logback/logback-1.0/testing/logback-1.0-testing.gradle +++ b/instrumentation/logback-1.0/testing/logback-1.0-testing.gradle @@ -17,7 +17,7 @@ apply from: "$rootDir/gradle/java.gradle" dependencies { - compileOnly project(":instrumentation:logback:logback-1.0:library") + compileOnly project(":instrumentation:logback-1.0:library") api project(':testing-common') diff --git a/instrumentation/logback/logback-1.0/testing/src/main/groovy/io/opentelemetry/instrumentation/logback/v1_0/AbstractLogbackTest.groovy b/instrumentation/logback-1.0/testing/src/main/groovy/io/opentelemetry/instrumentation/logback/v1_0/AbstractLogbackTest.groovy similarity index 100% rename from instrumentation/logback/logback-1.0/testing/src/main/groovy/io/opentelemetry/instrumentation/logback/v1_0/AbstractLogbackTest.groovy rename to instrumentation/logback-1.0/testing/src/main/groovy/io/opentelemetry/instrumentation/logback/v1_0/AbstractLogbackTest.groovy diff --git a/settings.gradle b/settings.gradle index 7ffe668be4..c57ba290e2 100644 --- a/settings.gradle +++ b/settings.gradle @@ -84,9 +84,9 @@ 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-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' +include ':instrumentation:apache-dubbo-2.7:javaagent' +include ':instrumentation:apache-dubbo-2.7:library' +include ':instrumentation:apache-dubbo-2.7:testing' include ':instrumentation:apache-httpasyncclient-4.1:javaagent' include ':instrumentation:apache-httpclient:apache-httpclient-2.0:javaagent' include ':instrumentation:apache-httpclient:apache-httpclient-4.0:javaagent' @@ -211,9 +211,9 @@ 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-testing' -include ':instrumentation:logback:logback-1.0:javaagent' -include ':instrumentation:logback:logback-1.0:library' -include ':instrumentation:logback:logback-1.0:testing' +include ':instrumentation:logback-1.0:javaagent' +include ':instrumentation:logback-1.0:library' +include ':instrumentation:logback-1.0:testing' include ':instrumentation:methods:javaagent' include ':instrumentation:mongo:mongo-3.1:javaagent' include ':instrumentation:mongo:mongo-3.1:library'