diff --git a/.fossa.yml b/.fossa.yml index 92ff822c1296..8cf387f46794 100644 --- a/.fossa.yml +++ b/.fossa.yml @@ -570,7 +570,7 @@ targets: target: ':instrumentation:jaxws:jaxws-2.0-metro-2.2:javaagent' - type: gradle path: ./ - target: ':instrumentation:jaxws:jaxws-common:javaagent' + target: ':instrumentation:jaxws:jaxws-common-2.0:javaagent' - type: gradle path: ./ target: ':instrumentation:jaxws:jaxws-jws-api-1.1:javaagent' @@ -1053,7 +1053,7 @@ targets: target: ':instrumentation:xxl-job:xxl-job-2.3.0:javaagent' - type: gradle path: ./ - target: ':instrumentation:xxl-job:xxl-job-common:javaagent' + target: ':instrumentation:xxl-job:xxl-job-common-1.9.2:javaagent' - type: gradle path: ./ target: ':instrumentation:zio:zio-2.0:javaagent' diff --git a/instrumentation/jaxws/jaxws-2.0/javaagent/build.gradle.kts b/instrumentation/jaxws/jaxws-2.0/javaagent/build.gradle.kts index c3e5ca62e32f..155c3a23a468 100644 --- a/instrumentation/jaxws/jaxws-2.0/javaagent/build.gradle.kts +++ b/instrumentation/jaxws/jaxws-2.0/javaagent/build.gradle.kts @@ -13,7 +13,7 @@ muzzle { dependencies { library("javax.xml.ws:jaxws-api:2.0") - implementation(project(":instrumentation:jaxws:jaxws-common:javaagent")) + implementation(project(":instrumentation:jaxws:jaxws-common-2.0:javaagent")) } tasks.test { diff --git a/instrumentation/jaxws/jaxws-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxws/v2_0/JaxWsSingletons.java b/instrumentation/jaxws/jaxws-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxws/v2_0/JaxWsSingletons.java index aa3dd91981ae..8304170fc424 100644 --- a/instrumentation/jaxws/jaxws-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxws/v2_0/JaxWsSingletons.java +++ b/instrumentation/jaxws/jaxws-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxws/v2_0/JaxWsSingletons.java @@ -6,8 +6,8 @@ package io.opentelemetry.javaagent.instrumentation.jaxws.v2_0; import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter; -import io.opentelemetry.javaagent.instrumentation.jaxws.common.JaxWsInstrumenterFactory; -import io.opentelemetry.javaagent.instrumentation.jaxws.common.JaxWsRequest; +import io.opentelemetry.javaagent.instrumentation.jaxws.common.v2_0.JaxWsInstrumenterFactory; +import io.opentelemetry.javaagent.instrumentation.jaxws.common.v2_0.JaxWsRequest; class JaxWsSingletons { diff --git a/instrumentation/jaxws/jaxws-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxws/v2_0/WebServiceProviderInstrumentation.java b/instrumentation/jaxws/jaxws-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxws/v2_0/WebServiceProviderInstrumentation.java index 9a5af85e6814..020b983111af 100644 --- a/instrumentation/jaxws/jaxws-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxws/v2_0/WebServiceProviderInstrumentation.java +++ b/instrumentation/jaxws/jaxws-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxws/v2_0/WebServiceProviderInstrumentation.java @@ -18,7 +18,7 @@ import io.opentelemetry.javaagent.bootstrap.CallDepth; import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation; import io.opentelemetry.javaagent.extension.instrumentation.TypeTransformer; -import io.opentelemetry.javaagent.instrumentation.jaxws.common.JaxWsRequest; +import io.opentelemetry.javaagent.instrumentation.jaxws.common.v2_0.JaxWsRequest; import javax.annotation.Nullable; import javax.xml.ws.Provider; import net.bytebuddy.asm.Advice; diff --git a/instrumentation/jaxws/jaxws-common/javaagent/build.gradle.kts b/instrumentation/jaxws/jaxws-common-2.0/javaagent/build.gradle.kts similarity index 100% rename from instrumentation/jaxws/jaxws-common/javaagent/build.gradle.kts rename to instrumentation/jaxws/jaxws-common-2.0/javaagent/build.gradle.kts diff --git a/instrumentation/jaxws/jaxws-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxws/common/JaxWsCodeAttributesGetter.java b/instrumentation/jaxws/jaxws-common-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxws/common/v2_0/JaxWsCodeAttributesGetter.java similarity index 86% rename from instrumentation/jaxws/jaxws-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxws/common/JaxWsCodeAttributesGetter.java rename to instrumentation/jaxws/jaxws-common-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxws/common/v2_0/JaxWsCodeAttributesGetter.java index c0db44ac40f7..c5d75a13a833 100644 --- a/instrumentation/jaxws/jaxws-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxws/common/JaxWsCodeAttributesGetter.java +++ b/instrumentation/jaxws/jaxws-common-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxws/common/v2_0/JaxWsCodeAttributesGetter.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.javaagent.instrumentation.jaxws.common; +package io.opentelemetry.javaagent.instrumentation.jaxws.common.v2_0; import io.opentelemetry.instrumentation.api.incubator.semconv.code.CodeAttributesGetter; diff --git a/instrumentation/jaxws/jaxws-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxws/common/JaxWsInstrumenterFactory.java b/instrumentation/jaxws/jaxws-common-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxws/common/v2_0/JaxWsInstrumenterFactory.java similarity index 94% rename from instrumentation/jaxws/jaxws-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxws/common/JaxWsInstrumenterFactory.java rename to instrumentation/jaxws/jaxws-common-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxws/common/v2_0/JaxWsInstrumenterFactory.java index 17b214049d74..5b6a80b94752 100644 --- a/instrumentation/jaxws/jaxws-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxws/common/JaxWsInstrumenterFactory.java +++ b/instrumentation/jaxws/jaxws-common-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxws/common/v2_0/JaxWsInstrumenterFactory.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.javaagent.instrumentation.jaxws.common; +package io.opentelemetry.javaagent.instrumentation.jaxws.common.v2_0; import io.opentelemetry.api.GlobalOpenTelemetry; import io.opentelemetry.instrumentation.api.incubator.semconv.code.CodeAttributesExtractor; diff --git a/instrumentation/jaxws/jaxws-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxws/common/JaxWsRequest.java b/instrumentation/jaxws/jaxws-common-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxws/common/v2_0/JaxWsRequest.java similarity index 85% rename from instrumentation/jaxws/jaxws-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxws/common/JaxWsRequest.java rename to instrumentation/jaxws/jaxws-common-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxws/common/v2_0/JaxWsRequest.java index c1727a007ec3..9496b5094ff8 100644 --- a/instrumentation/jaxws/jaxws-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxws/common/JaxWsRequest.java +++ b/instrumentation/jaxws/jaxws-common-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxws/common/v2_0/JaxWsRequest.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.javaagent.instrumentation.jaxws.common; +package io.opentelemetry.javaagent.instrumentation.jaxws.common.v2_0; public class JaxWsRequest { private final Class codeClass; diff --git a/instrumentation/jaxws/jaxws-jws-api-1.1/javaagent/build.gradle.kts b/instrumentation/jaxws/jaxws-jws-api-1.1/javaagent/build.gradle.kts index e15b42687ccd..8fcdaaad3b92 100644 --- a/instrumentation/jaxws/jaxws-jws-api-1.1/javaagent/build.gradle.kts +++ b/instrumentation/jaxws/jaxws-jws-api-1.1/javaagent/build.gradle.kts @@ -13,7 +13,7 @@ muzzle { dependencies { library("javax.jws:javax.jws-api:1.1") - implementation(project(":instrumentation:jaxws:jaxws-common:javaagent")) + implementation(project(":instrumentation:jaxws:jaxws-common-2.0:javaagent")) } tasks.test { diff --git a/instrumentation/jaxws/jaxws-jws-api-1.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxws/jws/v1_1/JwsAnnotationsInstrumentation.java b/instrumentation/jaxws/jaxws-jws-api-1.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxws/jws/v1_1/JwsAnnotationsInstrumentation.java index 382706a84a34..9b35aed77c36 100644 --- a/instrumentation/jaxws/jaxws-jws-api-1.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxws/jws/v1_1/JwsAnnotationsInstrumentation.java +++ b/instrumentation/jaxws/jaxws-jws-api-1.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxws/jws/v1_1/JwsAnnotationsInstrumentation.java @@ -24,7 +24,7 @@ import io.opentelemetry.javaagent.bootstrap.CallDepth; import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation; import io.opentelemetry.javaagent.extension.instrumentation.TypeTransformer; -import io.opentelemetry.javaagent.instrumentation.jaxws.common.JaxWsRequest; +import io.opentelemetry.javaagent.instrumentation.jaxws.common.v2_0.JaxWsRequest; import javax.annotation.Nullable; import javax.jws.WebService; import net.bytebuddy.asm.Advice; diff --git a/instrumentation/jaxws/jaxws-jws-api-1.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxws/jws/v1_1/JwsSingletons.java b/instrumentation/jaxws/jaxws-jws-api-1.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxws/jws/v1_1/JwsSingletons.java index ca5f4db05aad..f626342899c1 100644 --- a/instrumentation/jaxws/jaxws-jws-api-1.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxws/jws/v1_1/JwsSingletons.java +++ b/instrumentation/jaxws/jaxws-jws-api-1.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxws/jws/v1_1/JwsSingletons.java @@ -6,8 +6,8 @@ package io.opentelemetry.javaagent.instrumentation.jaxws.jws.v1_1; import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter; -import io.opentelemetry.javaagent.instrumentation.jaxws.common.JaxWsInstrumenterFactory; -import io.opentelemetry.javaagent.instrumentation.jaxws.common.JaxWsRequest; +import io.opentelemetry.javaagent.instrumentation.jaxws.common.v2_0.JaxWsInstrumenterFactory; +import io.opentelemetry.javaagent.instrumentation.jaxws.common.v2_0.JaxWsRequest; class JwsSingletons { diff --git a/instrumentation/xxl-job/xxl-job-1.9.2/javaagent/build.gradle.kts b/instrumentation/xxl-job/xxl-job-1.9.2/javaagent/build.gradle.kts index 2210f874d392..4cb97da51fc1 100644 --- a/instrumentation/xxl-job/xxl-job-1.9.2/javaagent/build.gradle.kts +++ b/instrumentation/xxl-job/xxl-job-1.9.2/javaagent/build.gradle.kts @@ -20,7 +20,7 @@ dependencies { library("com.xuxueli:xxl-job-core:1.9.2") { exclude("org.codehaus.groovy", "groovy") } - implementation(project(":instrumentation:xxl-job:xxl-job-common:javaagent")) + implementation(project(":instrumentation:xxl-job:xxl-job-common-1.9.2:javaagent")) testInstrumentation(project(":instrumentation:xxl-job:xxl-job-2.1.2:javaagent")) testInstrumentation(project(":instrumentation:xxl-job:xxl-job-2.3.0:javaagent")) @@ -28,7 +28,7 @@ dependencies { testImplementation("org.apache.groovy:groovy") // It needs the javax.annotation-api in xxl-job-core 1.9.2. testImplementation("javax.annotation:javax.annotation-api:1.3.2") - testImplementation(project(":instrumentation:xxl-job:xxl-job-common:testing")) + testImplementation(project(":instrumentation:xxl-job:xxl-job-common-1.9.2:testing")) latestDepTestLibrary("com.xuxueli:xxl-job-core:2.1.1") { // see xxl-job-2.1.2 module exclude("org.codehaus.groovy", "groovy") } diff --git a/instrumentation/xxl-job/xxl-job-1.9.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/xxljob/v1_9_2/GlueJobHandlerInstrumentation.java b/instrumentation/xxl-job/xxl-job-1.9.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/xxljob/v1_9_2/GlueJobHandlerInstrumentation.java index e79a6a5780d2..bbe59abfd790 100644 --- a/instrumentation/xxl-job/xxl-job-1.9.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/xxljob/v1_9_2/GlueJobHandlerInstrumentation.java +++ b/instrumentation/xxl-job/xxl-job-1.9.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/xxljob/v1_9_2/GlueJobHandlerInstrumentation.java @@ -13,8 +13,8 @@ import com.xxl.job.core.handler.IJobHandler; import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation; import io.opentelemetry.javaagent.extension.instrumentation.TypeTransformer; -import io.opentelemetry.javaagent.instrumentation.xxljob.common.XxlJobHelper; -import io.opentelemetry.javaagent.instrumentation.xxljob.common.XxlJobProcessRequest; +import io.opentelemetry.javaagent.instrumentation.xxljob.common.v1_9_2.XxlJobHelper; +import io.opentelemetry.javaagent.instrumentation.xxljob.common.v1_9_2.XxlJobProcessRequest; import javax.annotation.Nullable; import net.bytebuddy.asm.Advice; import net.bytebuddy.description.type.TypeDescription; diff --git a/instrumentation/xxl-job/xxl-job-1.9.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/xxljob/v1_9_2/ScriptJobHandlerInstrumentation.java b/instrumentation/xxl-job/xxl-job-1.9.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/xxljob/v1_9_2/ScriptJobHandlerInstrumentation.java index e68e4385290e..538889d874b1 100644 --- a/instrumentation/xxl-job/xxl-job-1.9.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/xxljob/v1_9_2/ScriptJobHandlerInstrumentation.java +++ b/instrumentation/xxl-job/xxl-job-1.9.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/xxljob/v1_9_2/ScriptJobHandlerInstrumentation.java @@ -14,8 +14,8 @@ import com.xxl.job.core.glue.GlueTypeEnum; import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation; import io.opentelemetry.javaagent.extension.instrumentation.TypeTransformer; -import io.opentelemetry.javaagent.instrumentation.xxljob.common.XxlJobHelper; -import io.opentelemetry.javaagent.instrumentation.xxljob.common.XxlJobProcessRequest; +import io.opentelemetry.javaagent.instrumentation.xxljob.common.v1_9_2.XxlJobHelper; +import io.opentelemetry.javaagent.instrumentation.xxljob.common.v1_9_2.XxlJobProcessRequest; import javax.annotation.Nullable; import net.bytebuddy.asm.Advice; import net.bytebuddy.description.type.TypeDescription; diff --git a/instrumentation/xxl-job/xxl-job-1.9.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/xxljob/v1_9_2/SimpleJobHandlerInstrumentation.java b/instrumentation/xxl-job/xxl-job-1.9.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/xxljob/v1_9_2/SimpleJobHandlerInstrumentation.java index bca6a8d20a8d..aa7cdb6d4d25 100644 --- a/instrumentation/xxl-job/xxl-job-1.9.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/xxljob/v1_9_2/SimpleJobHandlerInstrumentation.java +++ b/instrumentation/xxl-job/xxl-job-1.9.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/xxljob/v1_9_2/SimpleJobHandlerInstrumentation.java @@ -7,9 +7,9 @@ import static io.opentelemetry.javaagent.extension.matcher.AgentElementMatchers.hasClassesNamed; import static io.opentelemetry.javaagent.extension.matcher.AgentElementMatchers.hasSuperType; -import static io.opentelemetry.javaagent.instrumentation.xxljob.common.XxlJobConstants.XXL_GLUE_JOB_HANDLER; -import static io.opentelemetry.javaagent.instrumentation.xxljob.common.XxlJobConstants.XXL_METHOD_JOB_HANDLER; -import static io.opentelemetry.javaagent.instrumentation.xxljob.common.XxlJobConstants.XXL_SCRIPT_JOB_HANDLER; +import static io.opentelemetry.javaagent.instrumentation.xxljob.common.v1_9_2.XxlJobConstants.XXL_GLUE_JOB_HANDLER; +import static io.opentelemetry.javaagent.instrumentation.xxljob.common.v1_9_2.XxlJobConstants.XXL_METHOD_JOB_HANDLER; +import static io.opentelemetry.javaagent.instrumentation.xxljob.common.v1_9_2.XxlJobConstants.XXL_SCRIPT_JOB_HANDLER; import static io.opentelemetry.javaagent.instrumentation.xxljob.v1_9_2.XxlJobSingletons.helper; import static net.bytebuddy.matcher.ElementMatchers.isPublic; import static net.bytebuddy.matcher.ElementMatchers.named; @@ -21,8 +21,8 @@ import com.xxl.job.core.handler.IJobHandler; import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation; import io.opentelemetry.javaagent.extension.instrumentation.TypeTransformer; -import io.opentelemetry.javaagent.instrumentation.xxljob.common.XxlJobHelper; -import io.opentelemetry.javaagent.instrumentation.xxljob.common.XxlJobProcessRequest; +import io.opentelemetry.javaagent.instrumentation.xxljob.common.v1_9_2.XxlJobHelper; +import io.opentelemetry.javaagent.instrumentation.xxljob.common.v1_9_2.XxlJobProcessRequest; import javax.annotation.Nullable; import net.bytebuddy.asm.Advice; import net.bytebuddy.description.type.TypeDescription; diff --git a/instrumentation/xxl-job/xxl-job-1.9.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/xxljob/v1_9_2/XxlJobSingletons.java b/instrumentation/xxl-job/xxl-job-1.9.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/xxljob/v1_9_2/XxlJobSingletons.java index e7e92a8767cd..351ebb7fff55 100644 --- a/instrumentation/xxl-job/xxl-job-1.9.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/xxljob/v1_9_2/XxlJobSingletons.java +++ b/instrumentation/xxl-job/xxl-job-1.9.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/xxljob/v1_9_2/XxlJobSingletons.java @@ -8,9 +8,9 @@ import com.xxl.job.core.biz.model.ReturnT; import com.xxl.job.core.glue.GlueTypeEnum; import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter; -import io.opentelemetry.javaagent.instrumentation.xxljob.common.XxlJobHelper; -import io.opentelemetry.javaagent.instrumentation.xxljob.common.XxlJobInstrumenterFactory; -import io.opentelemetry.javaagent.instrumentation.xxljob.common.XxlJobProcessRequest; +import io.opentelemetry.javaagent.instrumentation.xxljob.common.v1_9_2.XxlJobHelper; +import io.opentelemetry.javaagent.instrumentation.xxljob.common.v1_9_2.XxlJobInstrumenterFactory; +import io.opentelemetry.javaagent.instrumentation.xxljob.common.v1_9_2.XxlJobProcessRequest; public class XxlJobSingletons { private static final String INSTRUMENTATION_NAME = "io.opentelemetry.xxl-job-1.9.2"; diff --git a/instrumentation/xxl-job/xxl-job-1.9.2/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/xxljob/v1_9_2/XxlJobTest.java b/instrumentation/xxl-job/xxl-job-1.9.2/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/xxljob/v1_9_2/XxlJobTest.java index c09b0afb5b9b..4a9b32d38ca5 100644 --- a/instrumentation/xxl-job/xxl-job-1.9.2/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/xxljob/v1_9_2/XxlJobTest.java +++ b/instrumentation/xxl-job/xxl-job-1.9.2/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/xxljob/v1_9_2/XxlJobTest.java @@ -5,18 +5,18 @@ package io.opentelemetry.javaagent.instrumentation.xxljob.v1_9_2; -import static io.opentelemetry.instrumentation.xxljob.XxlJobTestingConstants.DEFAULT_GLUE_UPDATE_TIME; -import static io.opentelemetry.instrumentation.xxljob.XxlJobTestingConstants.GLUE_JOB_GROOVY_SOURCE_OLD; -import static io.opentelemetry.instrumentation.xxljob.XxlJobTestingConstants.GLUE_JOB_SHELL_SCRIPT; +import static io.opentelemetry.instrumentation.xxljob.common.v1_9_2.XxlJobTestingConstants.DEFAULT_GLUE_UPDATE_TIME; +import static io.opentelemetry.instrumentation.xxljob.common.v1_9_2.XxlJobTestingConstants.GLUE_JOB_GROOVY_SOURCE_OLD; +import static io.opentelemetry.instrumentation.xxljob.common.v1_9_2.XxlJobTestingConstants.GLUE_JOB_SHELL_SCRIPT; import com.xxl.job.core.glue.GlueFactory; import com.xxl.job.core.glue.GlueTypeEnum; import com.xxl.job.core.handler.IJobHandler; import com.xxl.job.core.handler.impl.GlueJobHandler; import com.xxl.job.core.handler.impl.ScriptJobHandler; -import io.opentelemetry.instrumentation.xxljob.AbstractXxlJobTest; -import io.opentelemetry.instrumentation.xxljob.CustomizedFailedHandler; -import io.opentelemetry.instrumentation.xxljob.SimpleCustomizedHandler; +import io.opentelemetry.instrumentation.xxljob.common.v1_9_2.AbstractXxlJobTest; +import io.opentelemetry.instrumentation.xxljob.common.v1_9_2.CustomizedFailedHandler; +import io.opentelemetry.instrumentation.xxljob.common.v1_9_2.SimpleCustomizedHandler; class XxlJobTest extends AbstractXxlJobTest { @@ -39,7 +39,7 @@ class XxlJobTest extends AbstractXxlJobTest { @Override protected String getPackageName() { - return "io.opentelemetry.instrumentation.xxljob"; + return "io.opentelemetry.instrumentation.xxljob.common.v1_9_2"; } @Override diff --git a/instrumentation/xxl-job/xxl-job-2.1.2/javaagent/build.gradle.kts b/instrumentation/xxl-job/xxl-job-2.1.2/javaagent/build.gradle.kts index 50dc0c32a227..0a11eb0094b7 100644 --- a/instrumentation/xxl-job/xxl-job-2.1.2/javaagent/build.gradle.kts +++ b/instrumentation/xxl-job/xxl-job-2.1.2/javaagent/build.gradle.kts @@ -20,13 +20,13 @@ dependencies { library("com.xuxueli:xxl-job-core:2.1.2") { exclude("org.codehaus.groovy", "groovy") } - implementation(project(":instrumentation:xxl-job:xxl-job-common:javaagent")) + implementation(project(":instrumentation:xxl-job:xxl-job-common-1.9.2:javaagent")) testInstrumentation(project(":instrumentation:xxl-job:xxl-job-1.9.2:javaagent")) testInstrumentation(project(":instrumentation:xxl-job:xxl-job-2.3.0:javaagent")) testImplementation("org.apache.groovy:groovy") - testImplementation(project(":instrumentation:xxl-job:xxl-job-common:testing")) + testImplementation(project(":instrumentation:xxl-job:xxl-job-common-1.9.2:testing")) latestDepTestLibrary("com.xuxueli:xxl-job-core:2.2.+") { // see xxl-job-2.3.0 module exclude("org.codehaus.groovy", "groovy") } diff --git a/instrumentation/xxl-job/xxl-job-2.1.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/xxljob/v2_1_2/GlueJobHandlerInstrumentation.java b/instrumentation/xxl-job/xxl-job-2.1.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/xxljob/v2_1_2/GlueJobHandlerInstrumentation.java index 06da37f6b477..e2aeefd8ba6f 100644 --- a/instrumentation/xxl-job/xxl-job-2.1.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/xxljob/v2_1_2/GlueJobHandlerInstrumentation.java +++ b/instrumentation/xxl-job/xxl-job-2.1.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/xxljob/v2_1_2/GlueJobHandlerInstrumentation.java @@ -12,8 +12,8 @@ import com.xxl.job.core.handler.IJobHandler; import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation; import io.opentelemetry.javaagent.extension.instrumentation.TypeTransformer; -import io.opentelemetry.javaagent.instrumentation.xxljob.common.XxlJobHelper; -import io.opentelemetry.javaagent.instrumentation.xxljob.common.XxlJobProcessRequest; +import io.opentelemetry.javaagent.instrumentation.xxljob.common.v1_9_2.XxlJobHelper; +import io.opentelemetry.javaagent.instrumentation.xxljob.common.v1_9_2.XxlJobProcessRequest; import javax.annotation.Nullable; import net.bytebuddy.asm.Advice; import net.bytebuddy.description.type.TypeDescription; diff --git a/instrumentation/xxl-job/xxl-job-2.1.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/xxljob/v2_1_2/MethodJobHandlerInstrumentation.java b/instrumentation/xxl-job/xxl-job-2.1.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/xxljob/v2_1_2/MethodJobHandlerInstrumentation.java index 7dfb3573ebd5..ca32c3ea1896 100644 --- a/instrumentation/xxl-job/xxl-job-2.1.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/xxljob/v2_1_2/MethodJobHandlerInstrumentation.java +++ b/instrumentation/xxl-job/xxl-job-2.1.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/xxljob/v2_1_2/MethodJobHandlerInstrumentation.java @@ -11,8 +11,8 @@ import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation; import io.opentelemetry.javaagent.extension.instrumentation.TypeTransformer; -import io.opentelemetry.javaagent.instrumentation.xxljob.common.XxlJobHelper; -import io.opentelemetry.javaagent.instrumentation.xxljob.common.XxlJobProcessRequest; +import io.opentelemetry.javaagent.instrumentation.xxljob.common.v1_9_2.XxlJobHelper; +import io.opentelemetry.javaagent.instrumentation.xxljob.common.v1_9_2.XxlJobProcessRequest; import java.lang.reflect.Method; import javax.annotation.Nullable; import net.bytebuddy.asm.Advice; diff --git a/instrumentation/xxl-job/xxl-job-2.1.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/xxljob/v2_1_2/ScriptJobHandlerInstrumentation.java b/instrumentation/xxl-job/xxl-job-2.1.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/xxljob/v2_1_2/ScriptJobHandlerInstrumentation.java index eede9b223550..b21c47e9655b 100644 --- a/instrumentation/xxl-job/xxl-job-2.1.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/xxljob/v2_1_2/ScriptJobHandlerInstrumentation.java +++ b/instrumentation/xxl-job/xxl-job-2.1.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/xxljob/v2_1_2/ScriptJobHandlerInstrumentation.java @@ -12,8 +12,8 @@ import com.xxl.job.core.glue.GlueTypeEnum; import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation; import io.opentelemetry.javaagent.extension.instrumentation.TypeTransformer; -import io.opentelemetry.javaagent.instrumentation.xxljob.common.XxlJobHelper; -import io.opentelemetry.javaagent.instrumentation.xxljob.common.XxlJobProcessRequest; +import io.opentelemetry.javaagent.instrumentation.xxljob.common.v1_9_2.XxlJobHelper; +import io.opentelemetry.javaagent.instrumentation.xxljob.common.v1_9_2.XxlJobProcessRequest; import javax.annotation.Nullable; import net.bytebuddy.asm.Advice; import net.bytebuddy.description.type.TypeDescription; diff --git a/instrumentation/xxl-job/xxl-job-2.1.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/xxljob/v2_1_2/SimpleJobHandlerInstrumentation.java b/instrumentation/xxl-job/xxl-job-2.1.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/xxljob/v2_1_2/SimpleJobHandlerInstrumentation.java index 9faf0350059b..a100cb12d0df 100644 --- a/instrumentation/xxl-job/xxl-job-2.1.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/xxljob/v2_1_2/SimpleJobHandlerInstrumentation.java +++ b/instrumentation/xxl-job/xxl-job-2.1.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/xxljob/v2_1_2/SimpleJobHandlerInstrumentation.java @@ -7,9 +7,9 @@ import static io.opentelemetry.javaagent.extension.matcher.AgentElementMatchers.hasClassesNamed; import static io.opentelemetry.javaagent.extension.matcher.AgentElementMatchers.hasSuperType; -import static io.opentelemetry.javaagent.instrumentation.xxljob.common.XxlJobConstants.XXL_GLUE_JOB_HANDLER; -import static io.opentelemetry.javaagent.instrumentation.xxljob.common.XxlJobConstants.XXL_METHOD_JOB_HANDLER; -import static io.opentelemetry.javaagent.instrumentation.xxljob.common.XxlJobConstants.XXL_SCRIPT_JOB_HANDLER; +import static io.opentelemetry.javaagent.instrumentation.xxljob.common.v1_9_2.XxlJobConstants.XXL_GLUE_JOB_HANDLER; +import static io.opentelemetry.javaagent.instrumentation.xxljob.common.v1_9_2.XxlJobConstants.XXL_METHOD_JOB_HANDLER; +import static io.opentelemetry.javaagent.instrumentation.xxljob.common.v1_9_2.XxlJobConstants.XXL_SCRIPT_JOB_HANDLER; import static io.opentelemetry.javaagent.instrumentation.xxljob.v2_1_2.XxlJobSingletons.helper; import static net.bytebuddy.matcher.ElementMatchers.isPublic; import static net.bytebuddy.matcher.ElementMatchers.named; @@ -19,8 +19,8 @@ import com.xxl.job.core.handler.IJobHandler; import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation; import io.opentelemetry.javaagent.extension.instrumentation.TypeTransformer; -import io.opentelemetry.javaagent.instrumentation.xxljob.common.XxlJobHelper; -import io.opentelemetry.javaagent.instrumentation.xxljob.common.XxlJobProcessRequest; +import io.opentelemetry.javaagent.instrumentation.xxljob.common.v1_9_2.XxlJobHelper; +import io.opentelemetry.javaagent.instrumentation.xxljob.common.v1_9_2.XxlJobProcessRequest; import javax.annotation.Nullable; import net.bytebuddy.asm.Advice; import net.bytebuddy.description.type.TypeDescription; diff --git a/instrumentation/xxl-job/xxl-job-2.1.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/xxljob/v2_1_2/XxlJobSingletons.java b/instrumentation/xxl-job/xxl-job-2.1.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/xxljob/v2_1_2/XxlJobSingletons.java index 263184654410..c35a97ecbb95 100644 --- a/instrumentation/xxl-job/xxl-job-2.1.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/xxljob/v2_1_2/XxlJobSingletons.java +++ b/instrumentation/xxl-job/xxl-job-2.1.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/xxljob/v2_1_2/XxlJobSingletons.java @@ -7,9 +7,9 @@ import com.xxl.job.core.biz.model.ReturnT; import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter; -import io.opentelemetry.javaagent.instrumentation.xxljob.common.XxlJobHelper; -import io.opentelemetry.javaagent.instrumentation.xxljob.common.XxlJobInstrumenterFactory; -import io.opentelemetry.javaagent.instrumentation.xxljob.common.XxlJobProcessRequest; +import io.opentelemetry.javaagent.instrumentation.xxljob.common.v1_9_2.XxlJobHelper; +import io.opentelemetry.javaagent.instrumentation.xxljob.common.v1_9_2.XxlJobInstrumenterFactory; +import io.opentelemetry.javaagent.instrumentation.xxljob.common.v1_9_2.XxlJobProcessRequest; public class XxlJobSingletons { private static final String INSTRUMENTATION_NAME = "io.opentelemetry.xxl-job-2.1.2"; diff --git a/instrumentation/xxl-job/xxl-job-2.1.2/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/xxljob/v2_1_2/XxlJobTest.java b/instrumentation/xxl-job/xxl-job-2.1.2/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/xxljob/v2_1_2/XxlJobTest.java index d2bbc3729e88..74ee2b689c15 100644 --- a/instrumentation/xxl-job/xxl-job-2.1.2/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/xxljob/v2_1_2/XxlJobTest.java +++ b/instrumentation/xxl-job/xxl-job-2.1.2/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/xxljob/v2_1_2/XxlJobTest.java @@ -5,13 +5,13 @@ package io.opentelemetry.javaagent.instrumentation.xxljob.v2_1_2; -import static io.opentelemetry.instrumentation.xxljob.XxlJobTestingConstants.DEFAULT_GLUE_UPDATE_TIME; -import static io.opentelemetry.instrumentation.xxljob.XxlJobTestingConstants.GLUE_JOB_GROOVY_SOURCE_OLD; -import static io.opentelemetry.instrumentation.xxljob.XxlJobTestingConstants.GLUE_JOB_SHELL_SCRIPT; -import static io.opentelemetry.instrumentation.xxljob.XxlJobTestingConstants.METHOD_JOB_HANDLER_DESTROY_METHOD; -import static io.opentelemetry.instrumentation.xxljob.XxlJobTestingConstants.METHOD_JOB_HANDLER_INIT_METHOD; -import static io.opentelemetry.instrumentation.xxljob.XxlJobTestingConstants.METHOD_JOB_HANDLER_METHOD; -import static io.opentelemetry.instrumentation.xxljob.XxlJobTestingConstants.METHOD_JOB_HANDLER_OBJECT; +import static io.opentelemetry.instrumentation.xxljob.common.v1_9_2.XxlJobTestingConstants.DEFAULT_GLUE_UPDATE_TIME; +import static io.opentelemetry.instrumentation.xxljob.common.v1_9_2.XxlJobTestingConstants.GLUE_JOB_GROOVY_SOURCE_OLD; +import static io.opentelemetry.instrumentation.xxljob.common.v1_9_2.XxlJobTestingConstants.GLUE_JOB_SHELL_SCRIPT; +import static io.opentelemetry.instrumentation.xxljob.common.v1_9_2.XxlJobTestingConstants.METHOD_JOB_HANDLER_DESTROY_METHOD; +import static io.opentelemetry.instrumentation.xxljob.common.v1_9_2.XxlJobTestingConstants.METHOD_JOB_HANDLER_INIT_METHOD; +import static io.opentelemetry.instrumentation.xxljob.common.v1_9_2.XxlJobTestingConstants.METHOD_JOB_HANDLER_METHOD; +import static io.opentelemetry.instrumentation.xxljob.common.v1_9_2.XxlJobTestingConstants.METHOD_JOB_HANDLER_OBJECT; import com.xxl.job.core.glue.GlueFactory; import com.xxl.job.core.glue.GlueTypeEnum; @@ -19,9 +19,9 @@ import com.xxl.job.core.handler.impl.GlueJobHandler; import com.xxl.job.core.handler.impl.MethodJobHandler; import com.xxl.job.core.handler.impl.ScriptJobHandler; -import io.opentelemetry.instrumentation.xxljob.AbstractXxlJobTest; -import io.opentelemetry.instrumentation.xxljob.CustomizedFailedHandler; -import io.opentelemetry.instrumentation.xxljob.SimpleCustomizedHandler; +import io.opentelemetry.instrumentation.xxljob.common.v1_9_2.AbstractXxlJobTest; +import io.opentelemetry.instrumentation.xxljob.common.v1_9_2.CustomizedFailedHandler; +import io.opentelemetry.instrumentation.xxljob.common.v1_9_2.SimpleCustomizedHandler; class XxlJobTest extends AbstractXxlJobTest { @@ -51,7 +51,7 @@ class XxlJobTest extends AbstractXxlJobTest { @Override protected String getPackageName() { - return "io.opentelemetry.instrumentation.xxljob"; + return "io.opentelemetry.instrumentation.xxljob.common.v1_9_2"; } @Override diff --git a/instrumentation/xxl-job/xxl-job-2.3.0/javaagent/build.gradle.kts b/instrumentation/xxl-job/xxl-job-2.3.0/javaagent/build.gradle.kts index 4249cc7f9e26..e595591598b6 100644 --- a/instrumentation/xxl-job/xxl-job-2.3.0/javaagent/build.gradle.kts +++ b/instrumentation/xxl-job/xxl-job-2.3.0/javaagent/build.gradle.kts @@ -20,12 +20,12 @@ dependencies { library("com.xuxueli:xxl-job-core:2.3.0") { exclude("org.codehaus.groovy", "groovy") } - implementation(project(":instrumentation:xxl-job:xxl-job-common:javaagent")) + implementation(project(":instrumentation:xxl-job:xxl-job-common-1.9.2:javaagent")) testInstrumentation(project(":instrumentation:xxl-job:xxl-job-1.9.2:javaagent")) testInstrumentation(project(":instrumentation:xxl-job:xxl-job-2.1.2:javaagent")) testImplementation("org.apache.groovy:groovy") - testImplementation(project(":instrumentation:xxl-job:xxl-job-common:testing")) + testImplementation(project(":instrumentation:xxl-job:xxl-job-common-1.9.2:testing")) // latest version is tested in a separate test suite latestDepTestLibrary("com.xuxueli:xxl-job-core:3.2.+") // documented limitation @@ -37,7 +37,7 @@ testing { dependencies { val version = baseVersion("3.3.0").orLatest() implementation("com.xuxueli:xxl-job-core:$version") - implementation(project(":instrumentation:xxl-job:xxl-job-common:testing")) + implementation(project(":instrumentation:xxl-job:xxl-job-common-1.9.2:testing")) } } } diff --git a/instrumentation/xxl-job/xxl-job-2.3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/xxljob/v2_3_0/GlueJobHandlerInstrumentation.java b/instrumentation/xxl-job/xxl-job-2.3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/xxljob/v2_3_0/GlueJobHandlerInstrumentation.java index df5850cff41f..5d9b4c08298b 100644 --- a/instrumentation/xxl-job/xxl-job-2.3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/xxljob/v2_3_0/GlueJobHandlerInstrumentation.java +++ b/instrumentation/xxl-job/xxl-job-2.3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/xxljob/v2_3_0/GlueJobHandlerInstrumentation.java @@ -13,8 +13,8 @@ import com.xxl.job.core.handler.IJobHandler; import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation; import io.opentelemetry.javaagent.extension.instrumentation.TypeTransformer; -import io.opentelemetry.javaagent.instrumentation.xxljob.common.XxlJobHelper; -import io.opentelemetry.javaagent.instrumentation.xxljob.common.XxlJobProcessRequest; +import io.opentelemetry.javaagent.instrumentation.xxljob.common.v1_9_2.XxlJobHelper; +import io.opentelemetry.javaagent.instrumentation.xxljob.common.v1_9_2.XxlJobProcessRequest; import javax.annotation.Nullable; import net.bytebuddy.asm.Advice; import net.bytebuddy.description.type.TypeDescription; diff --git a/instrumentation/xxl-job/xxl-job-2.3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/xxljob/v2_3_0/MethodJobHandlerInstrumentation.java b/instrumentation/xxl-job/xxl-job-2.3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/xxljob/v2_3_0/MethodJobHandlerInstrumentation.java index 72a853779dad..1d1f55d2dd6b 100644 --- a/instrumentation/xxl-job/xxl-job-2.3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/xxljob/v2_3_0/MethodJobHandlerInstrumentation.java +++ b/instrumentation/xxl-job/xxl-job-2.3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/xxljob/v2_3_0/MethodJobHandlerInstrumentation.java @@ -12,8 +12,8 @@ import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation; import io.opentelemetry.javaagent.extension.instrumentation.TypeTransformer; -import io.opentelemetry.javaagent.instrumentation.xxljob.common.XxlJobHelper; -import io.opentelemetry.javaagent.instrumentation.xxljob.common.XxlJobProcessRequest; +import io.opentelemetry.javaagent.instrumentation.xxljob.common.v1_9_2.XxlJobHelper; +import io.opentelemetry.javaagent.instrumentation.xxljob.common.v1_9_2.XxlJobProcessRequest; import java.lang.reflect.Method; import javax.annotation.Nullable; import net.bytebuddy.asm.Advice; diff --git a/instrumentation/xxl-job/xxl-job-2.3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/xxljob/v2_3_0/ScriptJobHandlerInstrumentation.java b/instrumentation/xxl-job/xxl-job-2.3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/xxljob/v2_3_0/ScriptJobHandlerInstrumentation.java index e7a7880bd550..f7ef90835cc2 100644 --- a/instrumentation/xxl-job/xxl-job-2.3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/xxljob/v2_3_0/ScriptJobHandlerInstrumentation.java +++ b/instrumentation/xxl-job/xxl-job-2.3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/xxljob/v2_3_0/ScriptJobHandlerInstrumentation.java @@ -13,8 +13,8 @@ import com.xxl.job.core.glue.GlueTypeEnum; import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation; import io.opentelemetry.javaagent.extension.instrumentation.TypeTransformer; -import io.opentelemetry.javaagent.instrumentation.xxljob.common.XxlJobHelper; -import io.opentelemetry.javaagent.instrumentation.xxljob.common.XxlJobProcessRequest; +import io.opentelemetry.javaagent.instrumentation.xxljob.common.v1_9_2.XxlJobHelper; +import io.opentelemetry.javaagent.instrumentation.xxljob.common.v1_9_2.XxlJobProcessRequest; import javax.annotation.Nullable; import net.bytebuddy.asm.Advice; import net.bytebuddy.description.type.TypeDescription; diff --git a/instrumentation/xxl-job/xxl-job-2.3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/xxljob/v2_3_0/SimpleJobHandlerInstrumentation.java b/instrumentation/xxl-job/xxl-job-2.3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/xxljob/v2_3_0/SimpleJobHandlerInstrumentation.java index 52bbd84100b7..ffed724c67fe 100644 --- a/instrumentation/xxl-job/xxl-job-2.3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/xxljob/v2_3_0/SimpleJobHandlerInstrumentation.java +++ b/instrumentation/xxl-job/xxl-job-2.3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/xxljob/v2_3_0/SimpleJobHandlerInstrumentation.java @@ -6,9 +6,9 @@ package io.opentelemetry.javaagent.instrumentation.xxljob.v2_3_0; import static io.opentelemetry.javaagent.extension.matcher.AgentElementMatchers.hasSuperType; -import static io.opentelemetry.javaagent.instrumentation.xxljob.common.XxlJobConstants.XXL_GLUE_JOB_HANDLER; -import static io.opentelemetry.javaagent.instrumentation.xxljob.common.XxlJobConstants.XXL_METHOD_JOB_HANDLER; -import static io.opentelemetry.javaagent.instrumentation.xxljob.common.XxlJobConstants.XXL_SCRIPT_JOB_HANDLER; +import static io.opentelemetry.javaagent.instrumentation.xxljob.common.v1_9_2.XxlJobConstants.XXL_GLUE_JOB_HANDLER; +import static io.opentelemetry.javaagent.instrumentation.xxljob.common.v1_9_2.XxlJobConstants.XXL_METHOD_JOB_HANDLER; +import static io.opentelemetry.javaagent.instrumentation.xxljob.common.v1_9_2.XxlJobConstants.XXL_SCRIPT_JOB_HANDLER; import static io.opentelemetry.javaagent.instrumentation.xxljob.v2_3_0.XxlJobSingletons.helper; import static net.bytebuddy.matcher.ElementMatchers.isPublic; import static net.bytebuddy.matcher.ElementMatchers.named; @@ -19,8 +19,8 @@ import com.xxl.job.core.handler.IJobHandler; import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation; import io.opentelemetry.javaagent.extension.instrumentation.TypeTransformer; -import io.opentelemetry.javaagent.instrumentation.xxljob.common.XxlJobHelper; -import io.opentelemetry.javaagent.instrumentation.xxljob.common.XxlJobProcessRequest; +import io.opentelemetry.javaagent.instrumentation.xxljob.common.v1_9_2.XxlJobHelper; +import io.opentelemetry.javaagent.instrumentation.xxljob.common.v1_9_2.XxlJobProcessRequest; import javax.annotation.Nullable; import net.bytebuddy.asm.Advice; import net.bytebuddy.description.type.TypeDescription; diff --git a/instrumentation/xxl-job/xxl-job-2.3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/xxljob/v2_3_0/XxlJobSingletons.java b/instrumentation/xxl-job/xxl-job-2.3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/xxljob/v2_3_0/XxlJobSingletons.java index 833eefbeef2b..a4971ac0942a 100644 --- a/instrumentation/xxl-job/xxl-job-2.3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/xxljob/v2_3_0/XxlJobSingletons.java +++ b/instrumentation/xxl-job/xxl-job-2.3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/xxljob/v2_3_0/XxlJobSingletons.java @@ -9,9 +9,9 @@ import com.xxl.job.core.context.XxlJobContext; import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter; -import io.opentelemetry.javaagent.instrumentation.xxljob.common.XxlJobHelper; -import io.opentelemetry.javaagent.instrumentation.xxljob.common.XxlJobInstrumenterFactory; -import io.opentelemetry.javaagent.instrumentation.xxljob.common.XxlJobProcessRequest; +import io.opentelemetry.javaagent.instrumentation.xxljob.common.v1_9_2.XxlJobHelper; +import io.opentelemetry.javaagent.instrumentation.xxljob.common.v1_9_2.XxlJobInstrumenterFactory; +import io.opentelemetry.javaagent.instrumentation.xxljob.common.v1_9_2.XxlJobProcessRequest; public class XxlJobSingletons { private static final String INSTRUMENTATION_NAME = "io.opentelemetry.xxl-job-2.3.0"; diff --git a/instrumentation/xxl-job/xxl-job-2.3.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/xxljob/v2_3_0/XxlJobTest.java b/instrumentation/xxl-job/xxl-job-2.3.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/xxljob/v2_3_0/XxlJobTest.java index 76c64611a536..e6bff13617ed 100644 --- a/instrumentation/xxl-job/xxl-job-2.3.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/xxljob/v2_3_0/XxlJobTest.java +++ b/instrumentation/xxl-job/xxl-job-2.3.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/xxljob/v2_3_0/XxlJobTest.java @@ -5,13 +5,13 @@ package io.opentelemetry.javaagent.instrumentation.xxljob.v2_3_0; -import static io.opentelemetry.instrumentation.xxljob.XxlJobTestingConstants.DEFAULT_GLUE_UPDATE_TIME; -import static io.opentelemetry.instrumentation.xxljob.XxlJobTestingConstants.GLUE_JOB_GROOVY_SOURCE; -import static io.opentelemetry.instrumentation.xxljob.XxlJobTestingConstants.GLUE_JOB_SHELL_SCRIPT; -import static io.opentelemetry.instrumentation.xxljob.XxlJobTestingConstants.METHOD_JOB_HANDLER_DESTROY_METHOD; -import static io.opentelemetry.instrumentation.xxljob.XxlJobTestingConstants.METHOD_JOB_HANDLER_INIT_METHOD; -import static io.opentelemetry.instrumentation.xxljob.XxlJobTestingConstants.METHOD_JOB_HANDLER_METHOD; -import static io.opentelemetry.instrumentation.xxljob.XxlJobTestingConstants.METHOD_JOB_HANDLER_OBJECT; +import static io.opentelemetry.instrumentation.xxljob.common.v1_9_2.XxlJobTestingConstants.DEFAULT_GLUE_UPDATE_TIME; +import static io.opentelemetry.instrumentation.xxljob.common.v1_9_2.XxlJobTestingConstants.GLUE_JOB_GROOVY_SOURCE; +import static io.opentelemetry.instrumentation.xxljob.common.v1_9_2.XxlJobTestingConstants.GLUE_JOB_SHELL_SCRIPT; +import static io.opentelemetry.instrumentation.xxljob.common.v1_9_2.XxlJobTestingConstants.METHOD_JOB_HANDLER_DESTROY_METHOD; +import static io.opentelemetry.instrumentation.xxljob.common.v1_9_2.XxlJobTestingConstants.METHOD_JOB_HANDLER_INIT_METHOD; +import static io.opentelemetry.instrumentation.xxljob.common.v1_9_2.XxlJobTestingConstants.METHOD_JOB_HANDLER_METHOD; +import static io.opentelemetry.instrumentation.xxljob.common.v1_9_2.XxlJobTestingConstants.METHOD_JOB_HANDLER_OBJECT; import com.xxl.job.core.glue.GlueFactory; import com.xxl.job.core.glue.GlueTypeEnum; @@ -19,7 +19,7 @@ import com.xxl.job.core.handler.impl.GlueJobHandler; import com.xxl.job.core.handler.impl.MethodJobHandler; import com.xxl.job.core.handler.impl.ScriptJobHandler; -import io.opentelemetry.instrumentation.xxljob.AbstractXxlJobTest; +import io.opentelemetry.instrumentation.xxljob.common.v1_9_2.AbstractXxlJobTest; class XxlJobTest extends AbstractXxlJobTest { diff --git a/instrumentation/xxl-job/xxl-job-2.3.0/javaagent/src/xxlJob33Test/java/io/opentelemetry/javaagent/instrumentation/xxljob/v3_3_0/XxlJobTest.java b/instrumentation/xxl-job/xxl-job-2.3.0/javaagent/src/xxlJob33Test/java/io/opentelemetry/javaagent/instrumentation/xxljob/v3_3_0/XxlJobTest.java index ef9ebaeed115..b58dc7980118 100644 --- a/instrumentation/xxl-job/xxl-job-2.3.0/javaagent/src/xxlJob33Test/java/io/opentelemetry/javaagent/instrumentation/xxljob/v3_3_0/XxlJobTest.java +++ b/instrumentation/xxl-job/xxl-job-2.3.0/javaagent/src/xxlJob33Test/java/io/opentelemetry/javaagent/instrumentation/xxljob/v3_3_0/XxlJobTest.java @@ -5,9 +5,9 @@ package io.opentelemetry.javaagent.instrumentation.xxljob.v3_3_0; -import static io.opentelemetry.instrumentation.xxljob.XxlJobTestingConstants.DEFAULT_GLUE_UPDATE_TIME; -import static io.opentelemetry.instrumentation.xxljob.XxlJobTestingConstants.GLUE_JOB_GROOVY_SOURCE; -import static io.opentelemetry.instrumentation.xxljob.XxlJobTestingConstants.GLUE_JOB_SHELL_SCRIPT; +import static io.opentelemetry.instrumentation.xxljob.common.v1_9_2.XxlJobTestingConstants.DEFAULT_GLUE_UPDATE_TIME; +import static io.opentelemetry.instrumentation.xxljob.common.v1_9_2.XxlJobTestingConstants.GLUE_JOB_GROOVY_SOURCE; +import static io.opentelemetry.instrumentation.xxljob.common.v1_9_2.XxlJobTestingConstants.GLUE_JOB_SHELL_SCRIPT; import com.xxl.job.core.glue.GlueFactory; import com.xxl.job.core.glue.GlueTypeEnum; @@ -17,7 +17,7 @@ import com.xxl.job.core.handler.impl.ScriptJobHandler; import com.xxl.job.core.openapi.model.TriggerRequest; import com.xxl.job.core.thread.JobThread; -import io.opentelemetry.instrumentation.xxljob.AbstractXxlJobTest; +import io.opentelemetry.instrumentation.xxljob.common.v1_9_2.AbstractXxlJobTest; class XxlJobTest extends AbstractXxlJobTest { diff --git a/instrumentation/xxl-job/xxl-job-common/javaagent/build.gradle.kts b/instrumentation/xxl-job/xxl-job-common-1.9.2/javaagent/build.gradle.kts similarity index 100% rename from instrumentation/xxl-job/xxl-job-common/javaagent/build.gradle.kts rename to instrumentation/xxl-job/xxl-job-common-1.9.2/javaagent/build.gradle.kts diff --git a/instrumentation/xxl-job/xxl-job-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/xxljob/common/XxlJobCodeAttributesGetter.java b/instrumentation/xxl-job/xxl-job-common-1.9.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/xxljob/common/v1_9_2/XxlJobCodeAttributesGetter.java similarity index 99% rename from instrumentation/xxl-job/xxl-job-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/xxljob/common/XxlJobCodeAttributesGetter.java rename to instrumentation/xxl-job/xxl-job-common-1.9.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/xxljob/common/v1_9_2/XxlJobCodeAttributesGetter.java index 1db15ab916be..f263a05193f7 100644 --- a/instrumentation/xxl-job/xxl-job-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/xxljob/common/XxlJobCodeAttributesGetter.java +++ b/instrumentation/xxl-job/xxl-job-common-1.9.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/xxljob/common/v1_9_2/XxlJobCodeAttributesGetter.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.javaagent.instrumentation.xxljob.common; +package io.opentelemetry.javaagent.instrumentation.xxljob.common.v1_9_2; import com.xxl.job.core.glue.GlueTypeEnum; import io.opentelemetry.instrumentation.api.incubator.semconv.code.CodeAttributesGetter; diff --git a/instrumentation/xxl-job/xxl-job-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/xxljob/common/XxlJobConstants.java b/instrumentation/xxl-job/xxl-job-common-1.9.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/xxljob/common/v1_9_2/XxlJobConstants.java similarity index 98% rename from instrumentation/xxl-job/xxl-job-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/xxljob/common/XxlJobConstants.java rename to instrumentation/xxl-job/xxl-job-common-1.9.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/xxljob/common/v1_9_2/XxlJobConstants.java index 21c2dbaabf97..c99f0b6808c6 100644 --- a/instrumentation/xxl-job/xxl-job-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/xxljob/common/XxlJobConstants.java +++ b/instrumentation/xxl-job/xxl-job-common-1.9.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/xxljob/common/v1_9_2/XxlJobConstants.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.javaagent.instrumentation.xxljob.common; +package io.opentelemetry.javaagent.instrumentation.xxljob.common.v1_9_2; public class XxlJobConstants { public static final String XXL_GLUE_JOB_HANDLER = "com.xxl.job.core.handler.impl.GlueJobHandler"; diff --git a/instrumentation/xxl-job/xxl-job-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/xxljob/common/XxlJobExperimentalAttributeExtractor.java b/instrumentation/xxl-job/xxl-job-common-1.9.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/xxljob/common/v1_9_2/XxlJobExperimentalAttributeExtractor.java similarity index 99% rename from instrumentation/xxl-job/xxl-job-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/xxljob/common/XxlJobExperimentalAttributeExtractor.java rename to instrumentation/xxl-job/xxl-job-common-1.9.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/xxljob/common/v1_9_2/XxlJobExperimentalAttributeExtractor.java index a9bceb6a2b43..2bd3629c736b 100644 --- a/instrumentation/xxl-job/xxl-job-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/xxljob/common/XxlJobExperimentalAttributeExtractor.java +++ b/instrumentation/xxl-job/xxl-job-common-1.9.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/xxljob/common/v1_9_2/XxlJobExperimentalAttributeExtractor.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.javaagent.instrumentation.xxljob.common; +package io.opentelemetry.javaagent.instrumentation.xxljob.common.v1_9_2; import com.xxl.job.core.glue.GlueTypeEnum; import io.opentelemetry.api.common.AttributeKey; diff --git a/instrumentation/xxl-job/xxl-job-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/xxljob/common/XxlJobHelper.java b/instrumentation/xxl-job/xxl-job-common-1.9.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/xxljob/common/v1_9_2/XxlJobHelper.java similarity index 99% rename from instrumentation/xxl-job/xxl-job-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/xxljob/common/XxlJobHelper.java rename to instrumentation/xxl-job/xxl-job-common-1.9.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/xxljob/common/v1_9_2/XxlJobHelper.java index 96d128ba292c..d3354548fb22 100644 --- a/instrumentation/xxl-job/xxl-job-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/xxljob/common/XxlJobHelper.java +++ b/instrumentation/xxl-job/xxl-job-common-1.9.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/xxljob/common/v1_9_2/XxlJobHelper.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.javaagent.instrumentation.xxljob.common; +package io.opentelemetry.javaagent.instrumentation.xxljob.common.v1_9_2; import io.opentelemetry.context.Context; import io.opentelemetry.context.Scope; diff --git a/instrumentation/xxl-job/xxl-job-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/xxljob/common/XxlJobInstrumenterFactory.java b/instrumentation/xxl-job/xxl-job-common-1.9.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/xxljob/common/v1_9_2/XxlJobInstrumenterFactory.java similarity index 99% rename from instrumentation/xxl-job/xxl-job-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/xxljob/common/XxlJobInstrumenterFactory.java rename to instrumentation/xxl-job/xxl-job-common-1.9.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/xxljob/common/v1_9_2/XxlJobInstrumenterFactory.java index 894d0656d1f5..85ad47a65f8a 100644 --- a/instrumentation/xxl-job/xxl-job-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/xxljob/common/XxlJobInstrumenterFactory.java +++ b/instrumentation/xxl-job/xxl-job-common-1.9.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/xxljob/common/v1_9_2/XxlJobInstrumenterFactory.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.javaagent.instrumentation.xxljob.common; +package io.opentelemetry.javaagent.instrumentation.xxljob.common.v1_9_2; import io.opentelemetry.api.GlobalOpenTelemetry; import io.opentelemetry.api.common.AttributeKey; diff --git a/instrumentation/xxl-job/xxl-job-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/xxljob/common/XxlJobProcessRequest.java b/instrumentation/xxl-job/xxl-job-common-1.9.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/xxljob/common/v1_9_2/XxlJobProcessRequest.java similarity index 99% rename from instrumentation/xxl-job/xxl-job-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/xxljob/common/XxlJobProcessRequest.java rename to instrumentation/xxl-job/xxl-job-common-1.9.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/xxljob/common/v1_9_2/XxlJobProcessRequest.java index 78f691366f95..a663b50d002a 100644 --- a/instrumentation/xxl-job/xxl-job-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/xxljob/common/XxlJobProcessRequest.java +++ b/instrumentation/xxl-job/xxl-job-common-1.9.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/xxljob/common/v1_9_2/XxlJobProcessRequest.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.javaagent.instrumentation.xxljob.common; +package io.opentelemetry.javaagent.instrumentation.xxljob.common.v1_9_2; import com.xxl.job.core.glue.GlueTypeEnum; import com.xxl.job.core.handler.IJobHandler; diff --git a/instrumentation/xxl-job/xxl-job-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/xxljob/common/XxlJobSpanNameExtractor.java b/instrumentation/xxl-job/xxl-job-common-1.9.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/xxljob/common/v1_9_2/XxlJobSpanNameExtractor.java similarity index 99% rename from instrumentation/xxl-job/xxl-job-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/xxljob/common/XxlJobSpanNameExtractor.java rename to instrumentation/xxl-job/xxl-job-common-1.9.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/xxljob/common/v1_9_2/XxlJobSpanNameExtractor.java index 4c1e053feb00..9447f705d25f 100644 --- a/instrumentation/xxl-job/xxl-job-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/xxljob/common/XxlJobSpanNameExtractor.java +++ b/instrumentation/xxl-job/xxl-job-common-1.9.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/xxljob/common/v1_9_2/XxlJobSpanNameExtractor.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.javaagent.instrumentation.xxljob.common; +package io.opentelemetry.javaagent.instrumentation.xxljob.common.v1_9_2; import com.xxl.job.core.glue.GlueTypeEnum; import io.opentelemetry.instrumentation.api.incubator.semconv.code.CodeAttributesGetter; diff --git a/instrumentation/xxl-job/xxl-job-common/testing/build.gradle.kts b/instrumentation/xxl-job/xxl-job-common-1.9.2/testing/build.gradle.kts similarity index 100% rename from instrumentation/xxl-job/xxl-job-common/testing/build.gradle.kts rename to instrumentation/xxl-job/xxl-job-common-1.9.2/testing/build.gradle.kts diff --git a/instrumentation/xxl-job/xxl-job-common/testing/src/main/java/io/opentelemetry/instrumentation/xxljob/AbstractXxlJobTest.java b/instrumentation/xxl-job/xxl-job-common-1.9.2/testing/src/main/java/io/opentelemetry/instrumentation/xxljob/common/v1_9_2/AbstractXxlJobTest.java similarity index 97% rename from instrumentation/xxl-job/xxl-job-common/testing/src/main/java/io/opentelemetry/instrumentation/xxljob/AbstractXxlJobTest.java rename to instrumentation/xxl-job/xxl-job-common-1.9.2/testing/src/main/java/io/opentelemetry/instrumentation/xxljob/common/v1_9_2/AbstractXxlJobTest.java index 96eba57b37ed..0589c5ec4112 100644 --- a/instrumentation/xxl-job/xxl-job-common/testing/src/main/java/io/opentelemetry/instrumentation/xxljob/AbstractXxlJobTest.java +++ b/instrumentation/xxl-job/xxl-job-common-1.9.2/testing/src/main/java/io/opentelemetry/instrumentation/xxljob/common/v1_9_2/AbstractXxlJobTest.java @@ -3,11 +3,11 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.instrumentation.xxljob; +package io.opentelemetry.instrumentation.xxljob.common.v1_9_2; import static io.opentelemetry.api.common.AttributeKey.longKey; import static io.opentelemetry.api.common.AttributeKey.stringKey; -import static io.opentelemetry.instrumentation.xxljob.ExperimentalTestHelper.experimental; +import static io.opentelemetry.instrumentation.xxljob.common.v1_9_2.ExperimentalTestHelper.experimental; import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.equalTo; import static java.util.Arrays.asList; diff --git a/instrumentation/xxl-job/xxl-job-common/testing/src/main/java/io/opentelemetry/instrumentation/xxljob/CustomizedFailedHandler.java b/instrumentation/xxl-job/xxl-job-common-1.9.2/testing/src/main/java/io/opentelemetry/instrumentation/xxljob/common/v1_9_2/CustomizedFailedHandler.java similarity index 84% rename from instrumentation/xxl-job/xxl-job-common/testing/src/main/java/io/opentelemetry/instrumentation/xxljob/CustomizedFailedHandler.java rename to instrumentation/xxl-job/xxl-job-common-1.9.2/testing/src/main/java/io/opentelemetry/instrumentation/xxljob/common/v1_9_2/CustomizedFailedHandler.java index a4573ecf69a1..d90a5d2226b0 100644 --- a/instrumentation/xxl-job/xxl-job-common/testing/src/main/java/io/opentelemetry/instrumentation/xxljob/CustomizedFailedHandler.java +++ b/instrumentation/xxl-job/xxl-job-common-1.9.2/testing/src/main/java/io/opentelemetry/instrumentation/xxljob/common/v1_9_2/CustomizedFailedHandler.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.instrumentation.xxljob; +package io.opentelemetry.instrumentation.xxljob.common.v1_9_2; import com.xxl.job.core.biz.model.ReturnT; import com.xxl.job.core.handler.IJobHandler; diff --git a/instrumentation/xxl-job/xxl-job-common/testing/src/main/java/io/opentelemetry/instrumentation/xxljob/ExperimentalTestHelper.java b/instrumentation/xxl-job/xxl-job-common-1.9.2/testing/src/main/java/io/opentelemetry/instrumentation/xxljob/common/v1_9_2/ExperimentalTestHelper.java similarity index 88% rename from instrumentation/xxl-job/xxl-job-common/testing/src/main/java/io/opentelemetry/instrumentation/xxljob/ExperimentalTestHelper.java rename to instrumentation/xxl-job/xxl-job-common-1.9.2/testing/src/main/java/io/opentelemetry/instrumentation/xxljob/common/v1_9_2/ExperimentalTestHelper.java index 755806e3d67a..791830d39ba5 100644 --- a/instrumentation/xxl-job/xxl-job-common/testing/src/main/java/io/opentelemetry/instrumentation/xxljob/ExperimentalTestHelper.java +++ b/instrumentation/xxl-job/xxl-job-common-1.9.2/testing/src/main/java/io/opentelemetry/instrumentation/xxljob/common/v1_9_2/ExperimentalTestHelper.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.instrumentation.xxljob; +package io.opentelemetry.instrumentation.xxljob.common.v1_9_2; import javax.annotation.Nullable; diff --git a/instrumentation/xxl-job/xxl-job-common/testing/src/main/java/io/opentelemetry/instrumentation/xxljob/ReflectiveMethodsFactory.java b/instrumentation/xxl-job/xxl-job-common-1.9.2/testing/src/main/java/io/opentelemetry/instrumentation/xxljob/common/v1_9_2/ReflectiveMethodsFactory.java similarity index 95% rename from instrumentation/xxl-job/xxl-job-common/testing/src/main/java/io/opentelemetry/instrumentation/xxljob/ReflectiveMethodsFactory.java rename to instrumentation/xxl-job/xxl-job-common-1.9.2/testing/src/main/java/io/opentelemetry/instrumentation/xxljob/common/v1_9_2/ReflectiveMethodsFactory.java index 1f95d64ed982..5921165c3f2c 100644 --- a/instrumentation/xxl-job/xxl-job-common/testing/src/main/java/io/opentelemetry/instrumentation/xxljob/ReflectiveMethodsFactory.java +++ b/instrumentation/xxl-job/xxl-job-common-1.9.2/testing/src/main/java/io/opentelemetry/instrumentation/xxljob/common/v1_9_2/ReflectiveMethodsFactory.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.instrumentation.xxljob; +package io.opentelemetry.instrumentation.xxljob.common.v1_9_2; import com.xxl.job.core.biz.model.ReturnT; import java.lang.reflect.Method; diff --git a/instrumentation/xxl-job/xxl-job-common/testing/src/main/java/io/opentelemetry/instrumentation/xxljob/SimpleCustomizedHandler.java b/instrumentation/xxl-job/xxl-job-common-1.9.2/testing/src/main/java/io/opentelemetry/instrumentation/xxljob/common/v1_9_2/SimpleCustomizedHandler.java similarity index 85% rename from instrumentation/xxl-job/xxl-job-common/testing/src/main/java/io/opentelemetry/instrumentation/xxljob/SimpleCustomizedHandler.java rename to instrumentation/xxl-job/xxl-job-common-1.9.2/testing/src/main/java/io/opentelemetry/instrumentation/xxljob/common/v1_9_2/SimpleCustomizedHandler.java index 78df288fc852..b47be5a9a254 100644 --- a/instrumentation/xxl-job/xxl-job-common/testing/src/main/java/io/opentelemetry/instrumentation/xxljob/SimpleCustomizedHandler.java +++ b/instrumentation/xxl-job/xxl-job-common-1.9.2/testing/src/main/java/io/opentelemetry/instrumentation/xxljob/common/v1_9_2/SimpleCustomizedHandler.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.instrumentation.xxljob; +package io.opentelemetry.instrumentation.xxljob.common.v1_9_2; import com.xxl.job.core.biz.model.ReturnT; import com.xxl.job.core.handler.IJobHandler; diff --git a/instrumentation/xxl-job/xxl-job-common/testing/src/main/java/io/opentelemetry/instrumentation/xxljob/XxlJobTestingConstants.java b/instrumentation/xxl-job/xxl-job-common-1.9.2/testing/src/main/java/io/opentelemetry/instrumentation/xxljob/common/v1_9_2/XxlJobTestingConstants.java similarity index 96% rename from instrumentation/xxl-job/xxl-job-common/testing/src/main/java/io/opentelemetry/instrumentation/xxljob/XxlJobTestingConstants.java rename to instrumentation/xxl-job/xxl-job-common-1.9.2/testing/src/main/java/io/opentelemetry/instrumentation/xxljob/common/v1_9_2/XxlJobTestingConstants.java index ce02a3d28b6e..3d3fe8fd7715 100644 --- a/instrumentation/xxl-job/xxl-job-common/testing/src/main/java/io/opentelemetry/instrumentation/xxljob/XxlJobTestingConstants.java +++ b/instrumentation/xxl-job/xxl-job-common-1.9.2/testing/src/main/java/io/opentelemetry/instrumentation/xxljob/common/v1_9_2/XxlJobTestingConstants.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.instrumentation.xxljob; +package io.opentelemetry.instrumentation.xxljob.common.v1_9_2; import java.lang.reflect.Method; import javax.annotation.Nullable; diff --git a/settings.gradle.kts b/settings.gradle.kts index a34bc80d9759..3378f9bad4ff 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -384,7 +384,7 @@ include(":instrumentation:jaxws:jaxws-3.0-axis2-2.0-testing") include(":instrumentation:jaxws:jaxws-3.0-common-testing") include(":instrumentation:jaxws:jaxws-3.0-cxf-4.0-testing") include(":instrumentation:jaxws:jaxws-3.0-metro-3.0-testing") -include(":instrumentation:jaxws:jaxws-common:javaagent") +include(":instrumentation:jaxws:jaxws-common-2.0:javaagent") include(":instrumentation:jaxws:jaxws-jws-api-1.1:javaagent") include(":instrumentation:jboss-logmanager:jboss-logmanager-appender-1.1:javaagent") include(":instrumentation:jboss-logmanager:jboss-logmanager-mdc-1.1:javaagent") @@ -728,8 +728,8 @@ include(":instrumentation:wicket-8.0:wicket10-testing") include(":instrumentation:xxl-job:xxl-job-1.9.2:javaagent") include(":instrumentation:xxl-job:xxl-job-2.1.2:javaagent") include(":instrumentation:xxl-job:xxl-job-2.3.0:javaagent") -include(":instrumentation:xxl-job:xxl-job-common:javaagent") -include(":instrumentation:xxl-job:xxl-job-common:testing") +include(":instrumentation:xxl-job:xxl-job-common-1.9.2:javaagent") +include(":instrumentation:xxl-job:xxl-job-common-1.9.2:testing") include(":instrumentation:zio:zio-2.0:javaagent") include(":instrumentation:zio:zio-http-3.0:javaagent")