diff --git a/.fossa.yml b/.fossa.yml index d26a6e62a036..0907991a2226 100644 --- a/.fossa.yml +++ b/.fossa.yml @@ -237,7 +237,7 @@ targets: target: ':instrumentation:oshi:library' - type: gradle path: ./ - target: ':instrumentation:payara:javaagent' + target: ':instrumentation:payara-5.2020:javaagent' - type: gradle path: ./ target: ':instrumentation:powerjob-4.0:javaagent' diff --git a/docs/instrumentation-list.yaml b/docs/instrumentation-list.yaml index ea96055ecc3a..b643720154aa 100644 --- a/docs/instrumentation-list.yaml +++ b/docs/instrumentation-list.yaml @@ -11560,14 +11560,14 @@ libraries: type: STRING - name: direction type: STRING -- name: payara +- name: payara-5.2020 display_name: Payara description: | This instrumentation prevents Payara's built-in OpenTracing integration from interfering with OpenTelemetry server spans, it does not emit any telemetry on its own. library_link: https://www.payara.fish/ - source_path: instrumentation/payara + source_path: instrumentation/payara-5.2020 scope: - name: io.opentelemetry.payara + name: io.opentelemetry.payara-5.2020 has_javaagent: true - name: pekko-actor-1.0 display_name: Pekko Actors diff --git a/instrumentation/payara/javaagent/build.gradle.kts b/instrumentation/payara-5.2020/javaagent/build.gradle.kts similarity index 73% rename from instrumentation/payara/javaagent/build.gradle.kts rename to instrumentation/payara-5.2020/javaagent/build.gradle.kts index 42c945db3889..c530480a8218 100644 --- a/instrumentation/payara/javaagent/build.gradle.kts +++ b/instrumentation/payara-5.2020/javaagent/build.gradle.kts @@ -5,5 +5,5 @@ plugins { // No muzzle check because this instrumentation is written in ASM and muzzle won't work with it. dependencies { - library("fish.payara.extras:payara-embedded-web:5.2021.2") + library("fish.payara.extras:payara-embedded-web:5.2020.2") } diff --git a/instrumentation/payara/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/payara/PayaraInstrumentationModule.java b/instrumentation/payara-5.2020/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/payara/v5_2020/PayaraInstrumentationModule.java similarity index 90% rename from instrumentation/payara/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/payara/PayaraInstrumentationModule.java rename to instrumentation/payara-5.2020/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/payara/v5_2020/PayaraInstrumentationModule.java index 60b20b4f3a80..0f0b773c780f 100644 --- a/instrumentation/payara/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/payara/PayaraInstrumentationModule.java +++ b/instrumentation/payara-5.2020/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/payara/v5_2020/PayaraInstrumentationModule.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.javaagent.instrumentation.payara; +package io.opentelemetry.javaagent.instrumentation.payara.v5_2020; import static io.opentelemetry.javaagent.extension.matcher.AgentElementMatchers.hasClassesNamed; import static java.util.Collections.singletonList; @@ -18,7 +18,7 @@ public class PayaraInstrumentationModule extends InstrumentationModule { public PayaraInstrumentationModule() { - super("payara"); + super("payara", "payara-5.2020"); } @Override diff --git a/instrumentation/payara/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/payara/StandardWrapperInstrumentation.java b/instrumentation/payara-5.2020/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/payara/v5_2020/StandardWrapperInstrumentation.java similarity index 98% rename from instrumentation/payara/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/payara/StandardWrapperInstrumentation.java rename to instrumentation/payara-5.2020/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/payara/v5_2020/StandardWrapperInstrumentation.java index f8eb5aa03d46..ef8d33493b10 100644 --- a/instrumentation/payara/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/payara/StandardWrapperInstrumentation.java +++ b/instrumentation/payara-5.2020/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/payara/v5_2020/StandardWrapperInstrumentation.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.javaagent.instrumentation.payara; +package io.opentelemetry.javaagent.instrumentation.payara.v5_2020; import static net.bytebuddy.matcher.ElementMatchers.named; diff --git a/instrumentation/payara/metadata.yaml b/instrumentation/payara-5.2020/metadata.yaml similarity index 100% rename from instrumentation/payara/metadata.yaml rename to instrumentation/payara-5.2020/metadata.yaml diff --git a/settings.gradle.kts b/settings.gradle.kts index 519ed7408e9a..1ccc5b38c1a9 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -540,7 +540,7 @@ include(":instrumentation:oracle-ucp-11.2:testing") include(":instrumentation:oshi:javaagent") include(":instrumentation:oshi:library") include(":instrumentation:oshi:testing") -include(":instrumentation:payara:javaagent") +include(":instrumentation:payara-5.2020:javaagent") include(":instrumentation:pekko:pekko-actor-1.0:javaagent") include(":instrumentation:pekko:pekko-http-1.0:javaagent") include(":instrumentation:play:play-mvc:play-mvc-2.4:javaagent")