Skip to content

Add base versions to two common javaagent modules (jaxws, xxl-job) #18464

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
laurit merged 2 commits into from
May 3, 2026
Merged

Add base versions to two common javaagent modules (jaxws, xxl-job) #18464

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
609d3b1
Add base versions to two common javaagent modules (jaxws, xxl-job)
trask May 1, 2026
e5018e8
Merge remote-tracking branch 'upstream/main' into rename-common-modules
trask May 3, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .fossa.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down Expand Up @@ -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'
Expand Down
2 changes: 1 addition & 1 deletion instrumentation/jaxws/jaxws-2.0/javaagent/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions .../src/main/java/io/opentelemetry/javaagent/instrumentation/jaxws/v2_0/JaxWsSingletons.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand Down
2 changes: 1 addition & 1 deletion ...opentelemetry/javaagent/instrumentation/jaxws/v2_0/WebServiceProviderInstrumentation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
0 ...s/jaxws-common/javaagent/build.gradle.kts → ...xws-common-2.0/javaagent/build.gradle.kts
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...xws/common/JaxWsCodeAttributesGetter.java → ...ommon/v2_0/JaxWsCodeAttributesGetter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion ...axws/common/JaxWsInstrumenterFactory.java → ...common/v2_0/JaxWsInstrumenterFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...umentation/jaxws/common/JaxWsRequest.java → ...ation/jaxws/common/v2_0/JaxWsRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion instrumentation/jaxws/jaxws-jws-api-1.1/javaagent/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion ...opentelemetry/javaagent/instrumentation/jaxws/jws/v1_1/JwsAnnotationsInstrumentation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions ...rc/main/java/io/opentelemetry/javaagent/instrumentation/jaxws/jws/v1_1/JwsSingletons.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand Down
4 changes: 2 additions & 2 deletions instrumentation/xxl-job/xxl-job-1.9.2/javaagent/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,15 @@ 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"))

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")
}
Expand Down
4 changes: 2 additions & 2 deletions .../opentelemetry/javaagent/instrumentation/xxljob/v1_9_2/GlueJobHandlerInstrumentation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions ...pentelemetry/javaagent/instrumentation/xxljob/v1_9_2/ScriptJobHandlerInstrumentation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
10 changes: 5 additions & 5 deletions ...pentelemetry/javaagent/instrumentation/xxljob/v1_9_2/SimpleJobHandlerInstrumentation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand Down
6 changes: 3 additions & 3 deletions .../main/java/io/opentelemetry/javaagent/instrumentation/xxljob/v1_9_2/XxlJobSingletons.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
14 changes: 7 additions & 7 deletions ...nt/src/test/java/io/opentelemetry/javaagent/instrumentation/xxljob/v1_9_2/XxlJobTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions instrumentation/xxl-job/xxl-job-2.1.2/javaagent/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
}
Expand Down
4 changes: 2 additions & 2 deletions .../opentelemetry/javaagent/instrumentation/xxljob/v2_1_2/GlueJobHandlerInstrumentation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions ...pentelemetry/javaagent/instrumentation/xxljob/v2_1_2/MethodJobHandlerInstrumentation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions ...pentelemetry/javaagent/instrumentation/xxljob/v2_1_2/ScriptJobHandlerInstrumentation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
10 changes: 5 additions & 5 deletions ...pentelemetry/javaagent/instrumentation/xxljob/v2_1_2/SimpleJobHandlerInstrumentation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand Down
6 changes: 3 additions & 3 deletions .../main/java/io/opentelemetry/javaagent/instrumentation/xxljob/v2_1_2/XxlJobSingletons.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
22 changes: 11 additions & 11 deletions ...nt/src/test/java/io/opentelemetry/javaagent/instrumentation/xxljob/v2_1_2/XxlJobTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,23 +5,23 @@

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;
import com.xxl.job.core.handler.IJobHandler;
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 {

Expand Down Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions instrumentation/xxl-job/xxl-job-2.3.0/javaagent/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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"))
}
}
}
Expand Down
Loading
Loading