Skip to content

Commit c8894ef

Browse files
committed
refactor jms modules
1 parent 86fdd1f commit c8894ef

Some content is hidden

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

45 files changed

+6
-6
lines changed

dd-java-agent/instrumentation/aws-java/aws-java-sqs-1.0/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ dependencies {
2020
// Include httpclient instrumentation for testing because it is a dependency for aws-sdk.
2121
testImplementation project(':dd-java-agent:instrumentation:apache-httpclient:apache-httpclient-4.0')
2222
testImplementation project(':dd-java-agent:instrumentation:aws-java:aws-java-sdk-1.11')
23-
testImplementation project(':dd-java-agent:instrumentation:jms')
23+
testImplementation project(':dd-java-agent:instrumentation:jms:javax-jms-1.1')
2424

2525
// SQS<->JMS testing:
2626
testImplementation "jakarta.xml.bind:jakarta.xml.bind-api:2.3.2"

dd-java-agent/instrumentation/aws-java/aws-java-sqs-2.0/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ dependencies {
2222
// Include httpclient instrumentation for testing because it is a dependency for aws-sdk.
2323
testImplementation project(':dd-java-agent:instrumentation:apache-httpclient:apache-httpclient-4.0')
2424
testImplementation project(':dd-java-agent:instrumentation:aws-java:aws-java-sdk-2.2')
25-
testImplementation project(':dd-java-agent:instrumentation:jms')
25+
testImplementation project(':dd-java-agent:instrumentation:jms:javax-jms-1.1')
2626

2727
// SQS<->JMS testing:
2828
testImplementation group: 'org.elasticmq', name: 'elasticmq-rest-sqs_2.13', version: '1.4.7'

dd-java-agent/instrumentation/jakarta-jms/build.gradle renamed to dd-java-agent/instrumentation/jms/jakarta-jms-3.0/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ tasks.named("compileTestGroovy", GroovyCompile) {
2828
}
2929

3030
dependencies {
31-
implementation project(':dd-java-agent:instrumentation:jms')
31+
implementation project(':dd-java-agent:instrumentation:jms:javax-jms-1.1')
3232

3333
testImplementation 'jakarta.jms:jakarta.jms-api:3.0.0'
3434
testImplementation 'jakarta.ejb:jakarta.ejb-api:4.0.0'

dd-java-agent/instrumentation/jakarta-jms/gradle.lockfile renamed to dd-java-agent/instrumentation/jms/jakarta-jms-3.0/gradle.lockfile

File renamed without changes.

dd-java-agent/instrumentation/jakarta-jms/src/main/java/datadog/trace/instrumentation/jms/JakartaJmsModule.java renamed to dd-java-agent/instrumentation/jms/jakarta-jms-3.0/src/main/java/datadog/trace/instrumentation/jms/JakartaJmsModule.java

File renamed without changes.

dd-java-agent/instrumentation/jakarta-jms/src/test/groovy/JMS2Test.groovy renamed to dd-java-agent/instrumentation/jms/jakarta-jms-3.0/src/test/groovy/JMS2Test.groovy

File renamed without changes.

dd-java-agent/instrumentation/jakarta-jms/src/test/groovy/MDB1.groovy renamed to dd-java-agent/instrumentation/jms/jakarta-jms-3.0/src/test/groovy/MDB1.groovy

File renamed without changes.

dd-java-agent/instrumentation/jakarta-jms/src/test/groovy/MDB2.groovy renamed to dd-java-agent/instrumentation/jms/jakarta-jms-3.0/src/test/groovy/MDB2.groovy

File renamed without changes.

dd-java-agent/instrumentation/jakarta-jms/src/test/groovy/MDBBad.groovy renamed to dd-java-agent/instrumentation/jms/jakarta-jms-3.0/src/test/groovy/MDBBad.groovy

File renamed without changes.

dd-java-agent/instrumentation/jakarta-jms/src/test/groovy/MDBJmsMsg.groovy renamed to dd-java-agent/instrumentation/jms/jakarta-jms-3.0/src/test/groovy/MDBJmsMsg.groovy

File renamed without changes.

0 commit comments

Comments
 (0)