From c616fc99afc7d673b8c3a8f5b8aeb497733f9b85 Mon Sep 17 00:00:00 2001 From: Trask Stalnaker Date: Wed, 10 Aug 2022 12:31:06 -0700 Subject: [PATCH] Add liberty base version (#6456) * Add liberty base version * instrumentation name too --- .../{liberty => liberty-20.0}/javaagent/build.gradle.kts | 0 .../javaagent/instrumentation/liberty/LibertyHelper.java | 0 .../instrumentation/liberty/LibertyInstrumentationModule.java | 0 .../javaagent/instrumentation/liberty/LibertySingletons.java | 2 +- .../instrumentation/liberty/LibertyWebAppInstrumentation.java | 0 .../javaagent/instrumentation/liberty/ThreadLocalContext.java | 0 .../javaagent/build.gradle.kts | 0 .../dispatcher/LibertyDispatcherHttpAttributesGetter.java | 0 .../dispatcher/LibertyDispatcherInstrumentationModule.java | 0 .../dispatcher/LibertyDispatcherLinkInstrumentation.java | 0 .../dispatcher/LibertyDispatcherNetAttributesGetter.java | 0 .../liberty/dispatcher/LibertyDispatcherRequestGetter.java | 0 .../liberty/dispatcher/LibertyDispatcherSingletons.java | 2 +- .../instrumentation/liberty/dispatcher/LibertyRequest.java | 0 .../instrumentation/liberty/dispatcher/LibertyResponse.java | 0 settings.gradle.kts | 4 ++-- 16 files changed, 4 insertions(+), 4 deletions(-) rename instrumentation/liberty/{liberty => liberty-20.0}/javaagent/build.gradle.kts (100%) rename instrumentation/liberty/{liberty => liberty-20.0}/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/liberty/LibertyHelper.java (100%) rename instrumentation/liberty/{liberty => liberty-20.0}/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/liberty/LibertyInstrumentationModule.java (100%) rename instrumentation/liberty/{liberty => liberty-20.0}/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/liberty/LibertySingletons.java (98%) rename instrumentation/liberty/{liberty => liberty-20.0}/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/liberty/LibertyWebAppInstrumentation.java (100%) rename instrumentation/liberty/{liberty => liberty-20.0}/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/liberty/ThreadLocalContext.java (100%) rename instrumentation/liberty/{liberty-dispatcher => liberty-dispatcher-20.0}/javaagent/build.gradle.kts (100%) rename instrumentation/liberty/{liberty-dispatcher => liberty-dispatcher-20.0}/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/liberty/dispatcher/LibertyDispatcherHttpAttributesGetter.java (100%) rename instrumentation/liberty/{liberty-dispatcher => liberty-dispatcher-20.0}/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/liberty/dispatcher/LibertyDispatcherInstrumentationModule.java (100%) rename instrumentation/liberty/{liberty-dispatcher => liberty-dispatcher-20.0}/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/liberty/dispatcher/LibertyDispatcherLinkInstrumentation.java (100%) rename instrumentation/liberty/{liberty-dispatcher => liberty-dispatcher-20.0}/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/liberty/dispatcher/LibertyDispatcherNetAttributesGetter.java (100%) rename instrumentation/liberty/{liberty-dispatcher => liberty-dispatcher-20.0}/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/liberty/dispatcher/LibertyDispatcherRequestGetter.java (100%) rename instrumentation/liberty/{liberty-dispatcher => liberty-dispatcher-20.0}/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/liberty/dispatcher/LibertyDispatcherSingletons.java (98%) rename instrumentation/liberty/{liberty-dispatcher => liberty-dispatcher-20.0}/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/liberty/dispatcher/LibertyRequest.java (100%) rename instrumentation/liberty/{liberty-dispatcher => liberty-dispatcher-20.0}/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/liberty/dispatcher/LibertyResponse.java (100%) diff --git a/instrumentation/liberty/liberty/javaagent/build.gradle.kts b/instrumentation/liberty/liberty-20.0/javaagent/build.gradle.kts similarity index 100% rename from instrumentation/liberty/liberty/javaagent/build.gradle.kts rename to instrumentation/liberty/liberty-20.0/javaagent/build.gradle.kts diff --git a/instrumentation/liberty/liberty/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/liberty/LibertyHelper.java b/instrumentation/liberty/liberty-20.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/liberty/LibertyHelper.java similarity index 100% rename from instrumentation/liberty/liberty/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/liberty/LibertyHelper.java rename to instrumentation/liberty/liberty-20.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/liberty/LibertyHelper.java diff --git a/instrumentation/liberty/liberty/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/liberty/LibertyInstrumentationModule.java b/instrumentation/liberty/liberty-20.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/liberty/LibertyInstrumentationModule.java similarity index 100% rename from instrumentation/liberty/liberty/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/liberty/LibertyInstrumentationModule.java rename to instrumentation/liberty/liberty-20.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/liberty/LibertyInstrumentationModule.java diff --git a/instrumentation/liberty/liberty/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/liberty/LibertySingletons.java b/instrumentation/liberty/liberty-20.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/liberty/LibertySingletons.java similarity index 98% rename from instrumentation/liberty/liberty/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/liberty/LibertySingletons.java rename to instrumentation/liberty/liberty-20.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/liberty/LibertySingletons.java index 9d4e4aba4a7a..7468415faf50 100644 --- a/instrumentation/liberty/liberty/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/liberty/LibertySingletons.java +++ b/instrumentation/liberty/liberty-20.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/liberty/LibertySingletons.java @@ -15,7 +15,7 @@ import javax.servlet.http.HttpServletResponse; public final class LibertySingletons { - private static final String INSTRUMENTATION_NAME = "io.opentelemetry.liberty"; + private static final String INSTRUMENTATION_NAME = "io.opentelemetry.liberty-20.0"; private static final Instrumenter< ServletRequestContext, ServletResponseContext> diff --git a/instrumentation/liberty/liberty/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/liberty/LibertyWebAppInstrumentation.java b/instrumentation/liberty/liberty-20.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/liberty/LibertyWebAppInstrumentation.java similarity index 100% rename from instrumentation/liberty/liberty/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/liberty/LibertyWebAppInstrumentation.java rename to instrumentation/liberty/liberty-20.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/liberty/LibertyWebAppInstrumentation.java diff --git a/instrumentation/liberty/liberty/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/liberty/ThreadLocalContext.java b/instrumentation/liberty/liberty-20.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/liberty/ThreadLocalContext.java similarity index 100% rename from instrumentation/liberty/liberty/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/liberty/ThreadLocalContext.java rename to instrumentation/liberty/liberty-20.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/liberty/ThreadLocalContext.java diff --git a/instrumentation/liberty/liberty-dispatcher/javaagent/build.gradle.kts b/instrumentation/liberty/liberty-dispatcher-20.0/javaagent/build.gradle.kts similarity index 100% rename from instrumentation/liberty/liberty-dispatcher/javaagent/build.gradle.kts rename to instrumentation/liberty/liberty-dispatcher-20.0/javaagent/build.gradle.kts diff --git a/instrumentation/liberty/liberty-dispatcher/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/liberty/dispatcher/LibertyDispatcherHttpAttributesGetter.java b/instrumentation/liberty/liberty-dispatcher-20.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/liberty/dispatcher/LibertyDispatcherHttpAttributesGetter.java similarity index 100% rename from instrumentation/liberty/liberty-dispatcher/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/liberty/dispatcher/LibertyDispatcherHttpAttributesGetter.java rename to instrumentation/liberty/liberty-dispatcher-20.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/liberty/dispatcher/LibertyDispatcherHttpAttributesGetter.java diff --git a/instrumentation/liberty/liberty-dispatcher/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/liberty/dispatcher/LibertyDispatcherInstrumentationModule.java b/instrumentation/liberty/liberty-dispatcher-20.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/liberty/dispatcher/LibertyDispatcherInstrumentationModule.java similarity index 100% rename from instrumentation/liberty/liberty-dispatcher/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/liberty/dispatcher/LibertyDispatcherInstrumentationModule.java rename to instrumentation/liberty/liberty-dispatcher-20.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/liberty/dispatcher/LibertyDispatcherInstrumentationModule.java diff --git a/instrumentation/liberty/liberty-dispatcher/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/liberty/dispatcher/LibertyDispatcherLinkInstrumentation.java b/instrumentation/liberty/liberty-dispatcher-20.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/liberty/dispatcher/LibertyDispatcherLinkInstrumentation.java similarity index 100% rename from instrumentation/liberty/liberty-dispatcher/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/liberty/dispatcher/LibertyDispatcherLinkInstrumentation.java rename to instrumentation/liberty/liberty-dispatcher-20.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/liberty/dispatcher/LibertyDispatcherLinkInstrumentation.java diff --git a/instrumentation/liberty/liberty-dispatcher/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/liberty/dispatcher/LibertyDispatcherNetAttributesGetter.java b/instrumentation/liberty/liberty-dispatcher-20.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/liberty/dispatcher/LibertyDispatcherNetAttributesGetter.java similarity index 100% rename from instrumentation/liberty/liberty-dispatcher/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/liberty/dispatcher/LibertyDispatcherNetAttributesGetter.java rename to instrumentation/liberty/liberty-dispatcher-20.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/liberty/dispatcher/LibertyDispatcherNetAttributesGetter.java diff --git a/instrumentation/liberty/liberty-dispatcher/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/liberty/dispatcher/LibertyDispatcherRequestGetter.java b/instrumentation/liberty/liberty-dispatcher-20.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/liberty/dispatcher/LibertyDispatcherRequestGetter.java similarity index 100% rename from instrumentation/liberty/liberty-dispatcher/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/liberty/dispatcher/LibertyDispatcherRequestGetter.java rename to instrumentation/liberty/liberty-dispatcher-20.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/liberty/dispatcher/LibertyDispatcherRequestGetter.java diff --git a/instrumentation/liberty/liberty-dispatcher/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/liberty/dispatcher/LibertyDispatcherSingletons.java b/instrumentation/liberty/liberty-dispatcher-20.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/liberty/dispatcher/LibertyDispatcherSingletons.java similarity index 98% rename from instrumentation/liberty/liberty-dispatcher/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/liberty/dispatcher/LibertyDispatcherSingletons.java rename to instrumentation/liberty/liberty-dispatcher-20.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/liberty/dispatcher/LibertyDispatcherSingletons.java index b0dde684646b..41121d172f71 100644 --- a/instrumentation/liberty/liberty-dispatcher/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/liberty/dispatcher/LibertyDispatcherSingletons.java +++ b/instrumentation/liberty/liberty-dispatcher-20.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/liberty/dispatcher/LibertyDispatcherSingletons.java @@ -16,7 +16,7 @@ import io.opentelemetry.javaagent.bootstrap.internal.CommonConfig; public final class LibertyDispatcherSingletons { - private static final String INSTRUMENTATION_NAME = "io.opentelemetry.liberty-dispatcher"; + private static final String INSTRUMENTATION_NAME = "io.opentelemetry.liberty-dispatcher-20.0"; private static final Instrumenter INSTRUMENTER; diff --git a/instrumentation/liberty/liberty-dispatcher/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/liberty/dispatcher/LibertyRequest.java b/instrumentation/liberty/liberty-dispatcher-20.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/liberty/dispatcher/LibertyRequest.java similarity index 100% rename from instrumentation/liberty/liberty-dispatcher/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/liberty/dispatcher/LibertyRequest.java rename to instrumentation/liberty/liberty-dispatcher-20.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/liberty/dispatcher/LibertyRequest.java diff --git a/instrumentation/liberty/liberty-dispatcher/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/liberty/dispatcher/LibertyResponse.java b/instrumentation/liberty/liberty-dispatcher-20.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/liberty/dispatcher/LibertyResponse.java similarity index 100% rename from instrumentation/liberty/liberty-dispatcher/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/liberty/dispatcher/LibertyResponse.java rename to instrumentation/liberty/liberty-dispatcher-20.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/liberty/dispatcher/LibertyResponse.java diff --git a/settings.gradle.kts b/settings.gradle.kts index 749c1e44884d..17a3e91355f8 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -320,8 +320,8 @@ include(":instrumentation:lettuce:lettuce-5.1:javaagent") include(":instrumentation:lettuce:lettuce-5.1:library") include(":instrumentation:lettuce:lettuce-5.1:testing") include(":instrumentation:liberty:compile-stub") -include(":instrumentation:liberty:liberty:javaagent") -include(":instrumentation:liberty:liberty-dispatcher:javaagent") +include(":instrumentation:liberty:liberty-20.0:javaagent") +include(":instrumentation:liberty:liberty-dispatcher-20.0:javaagent") include(":instrumentation:log4j:log4j-appender-1.2:javaagent") include(":instrumentation:log4j:log4j-mdc-1.2:javaagent") include(":instrumentation:log4j:log4j-context-data:log4j-context-data-2.7:javaagent")