Skip to content

Commit 6ccbc06

Browse files
Rename several instrumentation modules to comply with naming conventions (#10237)
* Rename karate * refactor opentracing * rename jetty websocket * refactor vertx redis stubs * Rename hibernate modules * refactor micronaut modules * Rename jackson-core modules * Rename testng modules * remove leftover build files on jetty-client * rename kotlin-coroutines * rename scalikejdbc * rename rest related modules * fix build * Fix testng order and test templates --------- Co-authored-by: Nikita Tkachenko <[email protected]>
1 parent b9fde86 commit 6ccbc06

File tree

616 files changed

+875
-983
lines changed

Some content is hidden

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

616 files changed

+875
-983
lines changed

dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ dependencies {
120120

121121
iastTestImplementation project(':dd-java-agent:agent-iast:iast-test-fixtures')
122122
iastTestCompileOnly libs.forbiddenapis
123-
iastTestRuntimeOnly project(':dd-java-agent:instrumentation:jackson-core')
123+
iastTestRuntimeOnly project(':dd-java-agent:instrumentation:jackson-core:jackson-core-common')
124124
iastTestRuntimeOnly project(':dd-java-agent:instrumentation:jackson-core:jackson-core-2.8')
125125
iastTestRuntimeOnly project(':dd-java-agent:instrumentation:iast-instrumenter')
126126
iastTestRuntimeOnly project(':dd-java-agent:instrumentation:akka:akka-http:akka-http-10.2-iast')

dd-java-agent/instrumentation/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ subprojects { Project subProj ->
7979

8080
def path = subProj.getPath()
8181
subProj.plugins.withId("java") {
82-
if (!path.equals(':dd-java-agent:instrumentation:vertx:vertx-redis-client-3.9:stubs')) {
82+
if (!path.equals(':dd-java-agent:instrumentation:vertx:vertx-redis-client:vertx-redis-client-stubs')) {
8383
// don't include the redis RequestImpl stub
8484
parent_project.dependencies {
8585
implementation project(path)

dd-java-agent/instrumentation/cxf-2.1/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,8 @@ dependencies {
6868
testRuntimeOnly project(':dd-java-agent:instrumentation:jetty:jetty-server:jetty-server-11.0')
6969
testRuntimeOnly project(':dd-java-agent:instrumentation:jetty:jetty-server:jetty-server-12.0')
7070
testRuntimeOnly project(':dd-java-agent:instrumentation:trace-annotation')
71-
testRuntimeOnly project(':dd-java-agent:instrumentation:rs:jax-rs:jax-rs-annotations:jax-rs-annotations-2')
72-
testRuntimeOnly project(':dd-java-agent:instrumentation:rs:jakarta-rs-annotations-3')
71+
testRuntimeOnly project(':dd-java-agent:instrumentation:rs:jax-rs:jax-rs-annotations:jax-rs-annotations-2.0')
72+
testRuntimeOnly project(':dd-java-agent:instrumentation:rs:jakarta-rs-annotations-3.0')
7373

7474
cxf3LatestDepTestImplementation group: 'org.apache.cxf', name: 'cxf-rt-frontend-jaxrs', version: '3.+'
7575
cxf3LatestDepTestImplementation group: 'org.apache.cxf', name:'cxf-rt-transports-http-jetty', version: '3.+'

dd-java-agent/instrumentation/dropwizard/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apply from: "$rootDir/gradle/java.gradle"
33
//addTestSuiteForDir('latestDepTest', 'test')
44

55
dependencies {
6-
testImplementation project(':dd-java-agent:instrumentation:rs:jax-rs:jax-rs-annotations:jax-rs-annotations-2')
6+
testImplementation project(':dd-java-agent:instrumentation:rs:jax-rs:jax-rs-annotations:jax-rs-annotations-2.0')
77
testImplementation project(':dd-java-agent:instrumentation:servlet:javax-servlet:javax-servlet-3.0')
88

99
// First version with DropwizardTestSupport:

dd-java-agent/instrumentation/hibernate/build.gradle renamed to dd-java-agent/instrumentation/hibernate/hibernate-common/build.gradle

File renamed without changes.

dd-java-agent/instrumentation/hibernate/gradle.lockfile renamed to dd-java-agent/instrumentation/hibernate/hibernate-common/gradle.lockfile

File renamed without changes.

dd-java-agent/instrumentation/hibernate/src/main/java/datadog/trace/instrumentation/hibernate/HibernateDecorator.java renamed to dd-java-agent/instrumentation/hibernate/hibernate-common/src/main/java/datadog/trace/instrumentation/hibernate/HibernateDecorator.java

File renamed without changes.

dd-java-agent/instrumentation/hibernate/src/main/java/datadog/trace/instrumentation/hibernate/SessionMethodUtils.java renamed to dd-java-agent/instrumentation/hibernate/hibernate-common/src/main/java/datadog/trace/instrumentation/hibernate/SessionMethodUtils.java

File renamed without changes.

dd-java-agent/instrumentation/hibernate/src/main/java/datadog/trace/instrumentation/hibernate/SessionState.java renamed to dd-java-agent/instrumentation/hibernate/hibernate-common/src/main/java/datadog/trace/instrumentation/hibernate/SessionState.java

File renamed without changes.

dd-java-agent/instrumentation/hibernate/core-3.3/build.gradle renamed to dd-java-agent/instrumentation/hibernate/hibernate-core-3.3/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,12 @@ addTestSuiteForDir('latestDepTest', 'test')
3131
dependencies {
3232
compileOnly group: 'org.hibernate', name: 'hibernate-core', version: '3.3.0.GA'
3333

34-
implementation project(':dd-java-agent:instrumentation:hibernate')
34+
implementation project(':dd-java-agent:instrumentation:hibernate:hibernate-common')
3535

3636
testImplementation project(':dd-java-agent:instrumentation:jdbc')
3737
// Added to ensure cross compatibility:
38-
testImplementation project(':dd-java-agent:instrumentation:hibernate:core-4.0')
39-
testImplementation project(':dd-java-agent:instrumentation:hibernate:core-4.3')
38+
testImplementation project(':dd-java-agent:instrumentation:hibernate:hibernate-core-4.0')
39+
testImplementation project(':dd-java-agent:instrumentation:hibernate:hibernate-core-4.3')
4040

4141
testImplementation group: 'org.hibernate', name: 'hibernate-core', version: '3.3.0.SP1'
4242
testImplementation group: 'org.hibernate', name: 'hibernate-annotations', version: '3.4.0.GA'

0 commit comments

Comments
 (0)