Skip to content

Include dd-instrument-java #9792

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mcculls merged 3 commits into from
Oct 18, 2025
Merged

Include dd-instrument-java #9792

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
dcbd96a
Add dependency to dd-instrument-java 0.0.2
mcculls Oct 2, 2025
16fb15b
Add 'datadog.instrument' to the list of bootstrap package prefixes
mcculls Oct 17, 2025
9a3e6e6
Add 'datadog.instrument' to the list of ignored packages
mcculls Oct 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions dd-java-agent/agent-bootstrap/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,9 @@ dependencies {
api project(':components:json')
api libs.slf4j
// ^ Generally a bad idea for libraries, but we're shadowing.
api(variantOf(libs.instrumentjava, { classifier("all") })) {
transitive = false
}

testImplementation project(':dd-java-agent:testing')
}
Expand Down
3 changes: 2 additions & 1 deletion dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/Constants.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,15 @@ public final class Constants {
* packages which will be loaded on the bootstrap classloader
*
* <p>Updates should be mirrored in
* datadog.trace.agent.test.BootstrapClasspathSetup#BOOTSTRAP_PACKAGE_PREFIXES_COPY
* datadog.trace.agent.test.BootstrapClasspathSetupListener#BOOTSTRAP_PACKAGE_PREFIXES_COPY
*/
public static final String[] BOOTSTRAP_PACKAGE_PREFIXES = {
"datadog.slf4j",
"datadog.context",
"datadog.environment",
"datadog.json",
"datadog.yaml",
"datadog.instrument",
"datadog.appsec.api",
"datadog.trace.api",
"datadog.trace.bootstrap",
Expand Down
1 change: 1 addition & 0 deletions .../src/main/resources/datadog/trace/agent/tooling/bytebuddy/matcher/ignored_class_name.trie
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
1 com.sun.*
0 com.sun.jersey.api.client.*
0 com.sun.messaging.*
1 datadog.instrument.*
1 datadog.opentracing.*
1 datadog.slf4j.*
1 datadog.trace.*
Expand Down
1 change: 1 addition & 0 deletions ...ation-testing/src/main/java/datadog/trace/agent/test/BootstrapClasspathSetupListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@ public void launcherSessionOpened(LauncherSession session) {
"datadog.environment",
"datadog.json",
"datadog.yaml",
"datadog.instrument",
"datadog.appsec.api",
"datadog.trace.api",
"datadog.trace.bootstrap",
Expand Down
1 change: 1 addition & 0 deletions gradle/dependencies.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ final class CachedData {
exclude(project(':dd-java-agent:agent-crashtracking'))
exclude(project(':dd-java-agent:ddprof-lib'))
exclude(dependency('org.slf4j::'))
exclude(dependency(':dd-instrument-java:'))

// okhttp and its transitives (both fork and non-fork)
exclude(dependency('com.datadoghq.okhttp3:okhttp'))
Expand Down
2 changes: 2 additions & 0 deletions gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ junit5 = "5.12.2"
junit-platform = "1.12.2"
logback = "1.2.13"
bytebuddy = "1.17.7"
instrumentjava = "0.0.2"
scala = "2.11.12" # Last version to support Java 7 (2.12+ require Java 8+)
scala211 = "2.11.12"
scala212 = "2.12.18"
Expand Down Expand Up @@ -46,6 +47,7 @@ okhttp = { module = "com.datadoghq.okhttp3:okhttp", version.ref = "okhttp" }
okio = { module = "com.datadoghq.okio:okio", version.ref = "okio" }
bytebuddy = { module = "net.bytebuddy:byte-buddy", version.ref = "bytebuddy" }
bytebuddyagent = { module = "net.bytebuddy:byte-buddy-agent", version.ref = "bytebuddy" }
instrumentjava = { module = "com.datadoghq:dd-instrument-java", version.ref = "instrumentjava" }
autoservice-processor = { module = "com.google.auto.service:auto-service", version.ref = "autoservice" }
autoservice-annotation = { module = "com.google.auto.service:auto-service-annotations", version.ref = "autoservice" }
commons-math = { module = "org.apache.commons:commons-math3", version.ref = "commons" }
Expand Down
Loading