Add liberty base version (open-telemetry#6456)

* Add liberty base version * instrumentation name too
helios · Dec 4, 2022 · c616fc9 · c616fc9
1 parent 6e6868c
commit c616fc9
Show file tree

Hide file tree

Showing 16 changed files with 4 additions and 4 deletions.
diff --git a/...iberty/liberty/javaagent/build.gradle.kts → ...y/liberty-20.0/javaagent/build.gradle.kts b/...iberty/liberty/javaagent/build.gradle.kts → ...y/liberty-20.0/javaagent/build.gradle.kts
diff --git a/...nstrumentation/liberty/LibertyHelper.java → ...nstrumentation/liberty/LibertyHelper.java b/...nstrumentation/liberty/LibertyHelper.java → ...nstrumentation/liberty/LibertyHelper.java
diff --git a/...liberty/LibertyInstrumentationModule.java → ...liberty/LibertyInstrumentationModule.java b/...liberty/LibertyInstrumentationModule.java → ...liberty/LibertyInstrumentationModule.java
diff --git a/...umentation/liberty/LibertySingletons.java → ...umentation/liberty/LibertySingletons.java b/...umentation/liberty/LibertySingletons.java → ...umentation/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<HttpServletRequest>, ServletResponseContext<HttpServletResponse>>

diff --git a/...liberty/LibertyWebAppInstrumentation.java → ...liberty/LibertyWebAppInstrumentation.java b/...liberty/LibertyWebAppInstrumentation.java → ...liberty/LibertyWebAppInstrumentation.java
diff --git a/...mentation/liberty/ThreadLocalContext.java → ...mentation/liberty/ThreadLocalContext.java b/...mentation/liberty/ThreadLocalContext.java → ...mentation/liberty/ThreadLocalContext.java
diff --git a/...rty-dispatcher/javaagent/build.gradle.kts → ...ispatcher-20.0/javaagent/build.gradle.kts b/...rty-dispatcher/javaagent/build.gradle.kts → ...ispatcher-20.0/javaagent/build.gradle.kts
diff --git a/...ibertyDispatcherHttpAttributesGetter.java → ...ibertyDispatcherHttpAttributesGetter.java b/...ibertyDispatcherHttpAttributesGetter.java → ...ibertyDispatcherHttpAttributesGetter.java
diff --git a/...bertyDispatcherInstrumentationModule.java → ...bertyDispatcherInstrumentationModule.java b/...bertyDispatcherInstrumentationModule.java → ...bertyDispatcherInstrumentationModule.java
diff --git a/...LibertyDispatcherLinkInstrumentation.java → ...LibertyDispatcherLinkInstrumentation.java b/...LibertyDispatcherLinkInstrumentation.java → ...LibertyDispatcherLinkInstrumentation.java
diff --git a/...LibertyDispatcherNetAttributesGetter.java → ...LibertyDispatcherNetAttributesGetter.java b/...LibertyDispatcherNetAttributesGetter.java → ...LibertyDispatcherNetAttributesGetter.java
diff --git a/...tcher/LibertyDispatcherRequestGetter.java → ...tcher/LibertyDispatcherRequestGetter.java b/...tcher/LibertyDispatcherRequestGetter.java → ...tcher/LibertyDispatcherRequestGetter.java
diff --git a/...spatcher/LibertyDispatcherSingletons.java → ...spatcher/LibertyDispatcherSingletons.java b/...spatcher/LibertyDispatcherSingletons.java → ...spatcher/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<LibertyRequest, LibertyResponse> INSTRUMENTER;
 

diff --git a/...on/liberty/dispatcher/LibertyRequest.java → ...on/liberty/dispatcher/LibertyRequest.java b/...on/liberty/dispatcher/LibertyRequest.java → ...on/liberty/dispatcher/LibertyRequest.java
diff --git a/...n/liberty/dispatcher/LibertyResponse.java → ...n/liberty/dispatcher/LibertyResponse.java b/...n/liberty/dispatcher/LibertyResponse.java → ...n/liberty/dispatcher/LibertyResponse.java
diff --git 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")