Skip to content

Commit 822e1f3

Browse files
authored
Merge branch 'master' into ci/update-gradle-dependencies-20250119
2 parents 06e8717 + 4ce36ea commit 822e1f3

19 files changed

Lines changed: 526 additions & 1100 deletions

File tree

dd-java-agent/agent-tooling/src/main/resources/datadog/trace/agent/tooling/bytebuddy/matcher/ignored_class_name.trie

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -223,7 +223,6 @@
223223
2 javax.xml.*
224224
# note we do not ignore kotlinx because we instrument coroutines code
225225
2 kotlin.*
226-
1 lambdainternal.EventHandlerLoader$PojoHandlerAsStreamHandler
227226
2 net.sf.cglib.*
228227
2 org.apache.bcel.*
229228
2 org.apache.html.*

dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-itr-skipping-parameterized-spec-setup/coverages.ftl

Lines changed: 0 additions & 1 deletion
This file was deleted.

dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-itr-skipping-parameterized-spec-setup/events.ftl

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

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,3 +80,9 @@ sourceSets {
8080
}
8181
}
8282
}
83+
84+
tasks.named("compileLatestDepTestJava").configure {
85+
setJavaVersion(it, 11)
86+
sourceCompatibility = JavaVersion.VERSION_1_8
87+
targetCompatibility = JavaVersion.VERSION_1_8
88+
}

dd-java-agent/instrumentation/testng/testng-6/src/test/resources/test-efd-known-parameterized-test/coverages.ftl

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)