Skip to content

Commit 5d87eee

Browse files
trasktrask
committed
Add base versions to two common javaagent modules (jaxws, xxl-job)
Renames: - instrumentation/jaxws/jaxws-common -> jaxws-common-2.0 (package io.opentelemetry.javaagent.instrumentation.jaxws.common -> io.opentelemetry.javaagent.instrumentation.jaxws.common.v2_0) - instrumentation/xxl-job/xxl-job-common -> xxl-job-common-1.9.2 (package io.opentelemetry.javaagent.instrumentation.xxljob.common -> io.opentelemetry.javaagent.instrumentation.xxljob.common.v1_9_2) Follows the pattern established in open-telemetry#18423 for hibernate-common, jedis-common, jms-common, and redisson-common.
1 parent f9fab4f commit 5d87eee

48 files changed

Lines changed: 107 additions & 107 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.fossa.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -570,7 +570,7 @@ targets:
570570
target: ':instrumentation:jaxws:jaxws-2.0-metro-2.2:javaagent'
571571
- type: gradle
572572
path: ./
573-
target: ':instrumentation:jaxws:jaxws-common:javaagent'
573+
target: ':instrumentation:jaxws:jaxws-common-2.0:javaagent'
574574
- type: gradle
575575
path: ./
576576
target: ':instrumentation:jaxws:jaxws-jws-api-1.1:javaagent'
@@ -1053,7 +1053,7 @@ targets:
10531053
target: ':instrumentation:xxl-job:xxl-job-2.3.0:javaagent'
10541054
- type: gradle
10551055
path: ./
1056-
target: ':instrumentation:xxl-job:xxl-job-common:javaagent'
1056+
target: ':instrumentation:xxl-job:xxl-job-common-1.9.2:javaagent'
10571057
- type: gradle
10581058
path: ./
10591059
target: ':instrumentation:zio:zio-2.0:javaagent'

‎instrumentation/jaxws/jaxws-2.0/javaagent/build.gradle.kts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ muzzle {
1313

1414
dependencies {
1515
library("javax.xml.ws:jaxws-api:2.0")
16-
implementation(project(":instrumentation:jaxws:jaxws-common:javaagent"))
16+
implementation(project(":instrumentation:jaxws:jaxws-common-2.0:javaagent"))
1717
}
1818

1919
tasks.test {

‎instrumentation/jaxws/jaxws-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxws/v2_0/JaxWsSingletons.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
package io.opentelemetry.javaagent.instrumentation.jaxws.v2_0;
77

88
import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter;
9-
import io.opentelemetry.javaagent.instrumentation.jaxws.common.JaxWsInstrumenterFactory;
10-
import io.opentelemetry.javaagent.instrumentation.jaxws.common.JaxWsRequest;
9+
import io.opentelemetry.javaagent.instrumentation.jaxws.common.v2_0.JaxWsInstrumenterFactory;
10+
import io.opentelemetry.javaagent.instrumentation.jaxws.common.v2_0.JaxWsRequest;
1111

1212
class JaxWsSingletons {
1313

‎instrumentation/jaxws/jaxws-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxws/v2_0/WebServiceProviderInstrumentation.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
import io.opentelemetry.javaagent.bootstrap.CallDepth;
1919
import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
2020
import io.opentelemetry.javaagent.extension.instrumentation.TypeTransformer;
21-
import io.opentelemetry.javaagent.instrumentation.jaxws.common.JaxWsRequest;
21+
import io.opentelemetry.javaagent.instrumentation.jaxws.common.v2_0.JaxWsRequest;
2222
import javax.annotation.Nullable;
2323
import javax.xml.ws.Provider;
2424
import net.bytebuddy.asm.Advice;

instrumentation/jaxws/jaxws-common/javaagent/build.gradle.kts renamed to instrumentation/jaxws/jaxws-common-2.0/javaagent/build.gradle.kts

File renamed without changes.

instrumentation/jaxws/jaxws-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxws/common/JaxWsCodeAttributesGetter.java renamed to instrumentation/jaxws/jaxws-common-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxws/common/v2_0/JaxWsCodeAttributesGetter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6-
package io.opentelemetry.javaagent.instrumentation.jaxws.common;
6+
package io.opentelemetry.javaagent.instrumentation.jaxws.common.v2_0;
77

88
import io.opentelemetry.instrumentation.api.incubator.semconv.code.CodeAttributesGetter;
99

instrumentation/jaxws/jaxws-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxws/common/JaxWsInstrumenterFactory.java renamed to instrumentation/jaxws/jaxws-common-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxws/common/v2_0/JaxWsInstrumenterFactory.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6-
package io.opentelemetry.javaagent.instrumentation.jaxws.common;
6+
package io.opentelemetry.javaagent.instrumentation.jaxws.common.v2_0;
77

88
import io.opentelemetry.api.GlobalOpenTelemetry;
99
import io.opentelemetry.instrumentation.api.incubator.semconv.code.CodeAttributesExtractor;

instrumentation/jaxws/jaxws-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxws/common/JaxWsRequest.java renamed to instrumentation/jaxws/jaxws-common-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxws/common/v2_0/JaxWsRequest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6-
package io.opentelemetry.javaagent.instrumentation.jaxws.common;
6+
package io.opentelemetry.javaagent.instrumentation.jaxws.common.v2_0;
77

88
public class JaxWsRequest {
99
private final Class<?> codeClass;

‎instrumentation/jaxws/jaxws-jws-api-1.1/javaagent/build.gradle.kts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ muzzle {
1313

1414
dependencies {
1515
library("javax.jws:javax.jws-api:1.1")
16-
implementation(project(":instrumentation:jaxws:jaxws-common:javaagent"))
16+
implementation(project(":instrumentation:jaxws:jaxws-common-2.0:javaagent"))
1717
}
1818

1919
tasks.test {

‎instrumentation/jaxws/jaxws-jws-api-1.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxws/jws/v1_1/JwsAnnotationsInstrumentation.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
import io.opentelemetry.javaagent.bootstrap.CallDepth;
2525
import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
2626
import io.opentelemetry.javaagent.extension.instrumentation.TypeTransformer;
27-
import io.opentelemetry.javaagent.instrumentation.jaxws.common.JaxWsRequest;
27+
import io.opentelemetry.javaagent.instrumentation.jaxws.common.v2_0.JaxWsRequest;
2828
import javax.annotation.Nullable;
2929
import javax.jws.WebService;
3030
import net.bytebuddy.asm.Advice;

0 commit comments

Comments
 (0)