Skip to content

Commit a485d08

Browse files
bric3bric3
committed
Merge remote-tracking branch 'origin/master' into bdu/lazy-instrument-plugin
2 parents 4e77995 + e89d9e7 commit a485d08

File tree

755 files changed

+9049
-3320
lines changed

Some content is hidden

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

755 files changed

+9049
-3320
lines changed

‎.github/CODEOWNERS‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@
5555
/dd-java-agent/instrumentation/snakeyaml-1.33/ @DataDog/asm-java
5656
/dd-java-agent/instrumentation/velocity-1.5/ @DataDog/asm-java
5757
/dd-java-agent/instrumentation/freemarker/ @DataDog/asm-java
58+
/dd-java-agent/instrumentation/datadog/asm/ @DataDog/asm-java
5859
/dd-smoke-tests/iast-util/ @DataDog/asm-java
5960
/dd-smoke-tests/spring-security/ @DataDog/asm-java
6061
/dd-java-agent/instrumentation/commons-fileupload/ @DataDog/asm-java
@@ -97,9 +98,11 @@
9798
**/CiVisibility*.groovy @DataDog/ci-app-libraries-java
9899

99100
# @DataDog/debugger-java (Live Debugger)
100-
/dd-java-agent/agent-debugger/ @DataDog/debugger-java
101-
/dd-smoke-tests/debugger-integration-tests/ @DataDog/debugger-java
102-
/internal-api/src/main/java/datadog/trace/api/debugger/ @DataDog/debugger-java
101+
/dd-java-agent/agent-debugger/ @DataDog/debugger-java
102+
/dd-smoke-tests/debugger-integration-tests/ @DataDog/debugger-java
103+
/internal-api/src/main/java/datadog/trace/api/debugger/ @DataDog/debugger-java
104+
/dd-java-agent/instrumentation/datadog/dynamic-instrumentation/ @DataDog/debugger-java
105+
103106

104107
# @DataDog/data-jobs-monitoring
105108
/dd-java-agent/instrumentation/spark/ @DataDog/data-jobs-monitoring
@@ -137,7 +140,7 @@
137140
# @DataDog/profiling-java
138141
/dd-java-agent/agent-profiling/ @DataDog/profiling-java
139142
/dd-java-agent/agent-crashtracking/ @DataDog/profiling-java
140-
/dd-java-agent/instrumentation/exception-profiling/ @DataDog/profiling-java
143+
/dd-java-agent/instrumentation/datadog/profiling/ @DataDog/profiling-java
141144
/dd-java-agent/instrumentation/java/java-nio-1.8/ @DataDog/profiling-java
142145
/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/jfr/ @DataDog/profiling-java
143146
/dd-java-agent/agent-bootstrap/src/main/java11/datadog/trace/bootstrap/instrumentation/jfr/ @DataDog/profiling-java

‎.gitlab-ci.yml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -388,6 +388,14 @@ spotless:
388388
- ./gradlew --version
389389
- ./gradlew spotlessCheck $GRADLE_ARGS
390390

391+
check-instrumentation-naming:
392+
extends: .gradle_build
393+
stage: tests
394+
needs: [ ]
395+
script:
396+
- ./gradlew --version
397+
- ./gradlew checkInstrumentationNaming
398+
391399
config-inversion-linter:
392400
extends: .gradle_build
393401
stage: tests

‎buildSrc/src/main/kotlin/datadog/gradle/plugin/naming/InstrumentationNamingPlugin.kt‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,10 @@ class InstrumentationNamingPlugin : Plugin<Project> {
9898
if (moduleName in setOf("build", "src", ".gradle")) {
9999
return@childLoop
100100
}
101+
// skip the special datadog top level instrumentation directory
102+
if (parentName == null && moduleName == "datadog") {
103+
return@childLoop
104+
}
101105

102106
val childHasBuildFile = hasBuildFile(childDir)
103107
val nestedModules = childDir.listFiles { file -> file.isDirectory }?.filter { hasBuildFile(it) } ?: emptyList()

‎buildSrc/src/main/kotlin/datadog/gradle/plugin/testJvmConstraints/TestJvmConstraintsUtils.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,12 @@ private fun TestJvmConstraintsExtension.withinAllowedRange(currentJvmVersion: Ja
3333
val definedMax = maxJavaVersion.isPresent
3434

3535
if (definedMin && (minJavaVersion.get()) > currentJvmVersion) {
36-
logger.info("isWithinAllowedRange returns false b/o minProp=${minJavaVersion.get()} is defined and greater than version=$currentJvmVersion")
36+
logger.info("'isWithinAllowedRange' returns false b/o testJvmConstraints.minJavaVersion=${minJavaVersion.get()} is defined and greater than test JVM version=$currentJvmVersion")
3737
return false
3838
}
3939

4040
if (definedMax && (maxJavaVersion.get()) < currentJvmVersion) {
41-
logger.info("isWithinAllowedRange returns false b/o maxProp=${maxJavaVersion.get()} is defined and lower than version=$currentJvmVersion")
41+
logger.info("'isWithinAllowedRange' returns false because testJvmConstraints.maxJavaVersion=${maxJavaVersion.get()} is defined and lower than test JVM version=$currentJvmVersion")
4242
return false
4343
}
4444

‎communication/gradle.lockfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,8 @@ de.thetaphi:forbiddenapis:3.10=compileClasspath
4545
io.leangen.geantyref:geantyref:1.3.16=testRuntimeClasspath
4646
jaxen:jaxen:2.0.0=spotbugs
4747
junit:junit:4.12=testCompileClasspath,testRuntimeClasspath
48-
net.bytebuddy:byte-buddy-agent:1.18.1=testCompileClasspath,testRuntimeClasspath
49-
net.bytebuddy:byte-buddy:1.18.1=testCompileClasspath,testRuntimeClasspath
48+
net.bytebuddy:byte-buddy-agent:1.18.3=testCompileClasspath,testRuntimeClasspath
49+
net.bytebuddy:byte-buddy:1.18.3=testCompileClasspath,testRuntimeClasspath
5050
net.sf.saxon:Saxon-HE:12.9=spotbugs
5151
org.apache.ant:ant-antlr:1.10.14=codenarc
5252
org.apache.ant:ant-junit:1.10.14=codenarc

‎components/yaml/build.gradle.kts‎

Lines changed: 0 additions & 9 deletions
This file was deleted.

‎components/yaml/gradle.lockfile‎

Lines changed: 0 additions & 73 deletions
This file was deleted.

‎dd-java-agent/agent-aiguard/gradle.lockfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@ commons-io:commons-io:2.20.0=spotbugs
3838
de.thetaphi:forbiddenapis:3.10=compileClasspath
3939
io.leangen.geantyref:geantyref:1.3.16=testRuntimeClasspath
4040
jaxen:jaxen:2.0.0=spotbugs
41-
net.bytebuddy:byte-buddy-agent:1.18.1=testCompileClasspath,testRuntimeClasspath
42-
net.bytebuddy:byte-buddy:1.18.1=testCompileClasspath,testRuntimeClasspath
41+
net.bytebuddy:byte-buddy-agent:1.18.3=testCompileClasspath,testRuntimeClasspath
42+
net.bytebuddy:byte-buddy:1.18.3=testCompileClasspath,testRuntimeClasspath
4343
net.sf.saxon:Saxon-HE:12.9=spotbugs
4444
org.apache.ant:ant-antlr:1.10.14=codenarc
4545
org.apache.ant:ant-junit:1.10.14=codenarc

‎dd-java-agent/agent-bootstrap/gradle.lockfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@ io.sqreen:libsqreen:17.3.0=jmhRuntimeClasspath,testRuntimeClasspath
4343
javax.servlet:javax.servlet-api:3.1.0=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
4444
jaxen:jaxen:2.0.0=spotbugs
4545
junit:junit:4.13.2=jmhRuntimeClasspath,testRuntimeClasspath
46-
net.bytebuddy:byte-buddy-agent:1.18.1=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
47-
net.bytebuddy:byte-buddy:1.18.1=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
46+
net.bytebuddy:byte-buddy-agent:1.18.3=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
47+
net.bytebuddy:byte-buddy:1.18.3=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
4848
net.java.dev.jna:jna-platform:5.8.0=jmhRuntimeClasspath,testRuntimeClasspath
4949
net.java.dev.jna:jna:5.8.0=jmhRuntimeClasspath,testRuntimeClasspath
5050
net.sf.jopt-simple:jopt-simple:5.0.4=jmh,jmhCompileClasspath,jmhRuntimeClasspath

‎dd-java-agent/agent-builder/gradle.lockfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@ io.sqreen:libsqreen:17.3.0=testRuntimeClasspath
4343
javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath
4444
jaxen:jaxen:2.0.0=spotbugs
4545
junit:junit:4.13.2=testRuntimeClasspath
46-
net.bytebuddy:byte-buddy-agent:1.18.1=compileClasspath,main_java11CompileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
47-
net.bytebuddy:byte-buddy:1.18.1=compileClasspath,main_java11CompileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
46+
net.bytebuddy:byte-buddy-agent:1.18.3=compileClasspath,main_java11CompileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
47+
net.bytebuddy:byte-buddy:1.18.3=compileClasspath,main_java11CompileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
4848
net.java.dev.jna:jna-platform:5.8.0=runtimeClasspath,testRuntimeClasspath
4949
net.java.dev.jna:jna:5.8.0=runtimeClasspath,testRuntimeClasspath
5050
net.sf.saxon:Saxon-HE:12.9=spotbugs

0 commit comments

Comments
 (0)